Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7a72695c05 
					 
					
						
						
							
							Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'  
						
						... 
						
						
						
						* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.
Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-08-07 22:45:46 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						a09ae4ef65 
					 
					
						
						
							
							Remove duplicated png and mng signatures.  
						
						... 
						
						
						
						Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2012-06-15 00:53:34 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						ddece75bc8 
					 
					
						
						
							
							png_parser: use designated initializers  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2012-06-14 17:04:00 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						82570d2f09 
					 
					
						
						
							
							png_parser: dont falsely mark frames as keyframes  
						
						... 
						
						
						
						Fixes Ticket1381
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-06-02 21:12:20 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						3d42addf33 
					 
					
						
						
							
							png_parser: try to fix big endian  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-05-05 02:12:40 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						3c1d52d30b 
					 
					
						
						
							
							Fix a few @file doxy inconsistencies.  
						
						
						
						
					 
					
						2012-05-04 18:50:59 +02:00 
						 
				 
			
				
					
						
							
							
								Peter Holik 
							
						 
					 
					
						
						
							
						
						2ee6dca3b8 
					 
					
						
						
							
							png_parser  
						
						... 
						
						
						
						This adds support for png image2pipe streaming
Update to latest git by: Eugene Ware <eugene@noblesamurai.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-05-04 16:57:54 +02:00