Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						79d82a6574
					 | 
					
						
						
							
							avformat/hnm: fix decoding of 256x256 video
						
						
						
						
						
						
						
						Fixes Ticket3464
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2014-04-16 01:37:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						28ee7757f5
					 | 
					
						
						
							
							Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'
						
						
						
						
						
						
						
						* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430':
  lavf: more correct printf format specifiers
Conflicts:
	libavformat/asfdec.c
	libavformat/cafdec.c
	libavformat/dxa.c
	libavformat/framecrcenc.c
	libavformat/hnm.c
	libavformat/iff.c
	libavformat/mov.c
	libavformat/mxfdec.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/smacker.c
	libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2014-03-11 21:05:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Diego Biurrun
							
						 
					 | 
					
						
						
							
						
						d92024f18f
					 | 
					
						
						
							
							lavf: more correct printf format specifiers
						
						
						
						
						
						
					 | 
					
						2014-03-11 13:13:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						5c4aa72b75
					 | 
					
						
						
							
							avformat/hnm: check chunk_size == 0
						
						
						
						
						
						
						
						Fixes potential infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2013-11-22 23:52:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						a2bfee36b7
					 | 
					
						
						
							
							Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
						
						
						
						
						
						
						
						* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder
Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2013-11-01 10:46:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Kment
							
						 
					 | 
					
						
						
							
						
						9af7a8523a
					 | 
					
						
						
							
							HNM4/HNM4A demuxer & video decoder
						
						
						
						
						
						
						
						Signed-off-by: Diego Biurrun <diego@biurrun.de> 
						
						
					 | 
					
						2013-10-31 17:45:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |