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 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							36ef5369ee 
							
						 
					 
					
						
						
							
							Replace all CODEC_ID_* with AV_CODEC_ID_*  
						
						
						
						
					 
					
						2012-08-07 16:00:24 +02:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
						
						
							
						
						
							2912e87a6c 
							
						 
					 
					
						
						
							
							Replace FFmpeg with Libav in licence headers  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-03-19 13:33:20 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Elio Pettenò 
							
						 
					 
					
						
						
						
						
							
						
						
							e7e2df27f8 
							
						 
					 
					
						
						
							
							Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.  
						
						... 
						
						
						
						None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c) 
						
						
					 
					
						2011-01-28 03:15:34 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Elio Pettenò 
							
						 
					 
					
						
						
						
						
							
						
						
							d36beb3f69 
							
						 
					 
					
						
						
							
							Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.  
						
						... 
						
						
						
						None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-01-26 16:08:45 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							ba87f0801d 
							
						 
					 
					
						
						
							
							Remove explicit filename from Doxygen @file commands.  
						
						... 
						
						
						
						Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-04-20 14:45:34 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							bad5537e2c 
							
						 
					 
					
						
						
							
							Use full internal pathname in doxygen @file directives.  
						
						... 
						
						
						
						Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-02-01 02:00:19 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							406792e7b0 
							
						 
					 
					
						
						
							
							cosmetics: Remove pointless period after copyright statement non-sentences.  
						
						... 
						
						
						
						Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-01-19 15:46:40 +00:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
						
						
							
						
						
							ab8072a6a2 
							
						 
					 
					
						
						
							
							move imx_dump_header bitstream filter in its own file  
						
						... 
						
						
						
						Originally committed as revision 9067 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-05-19 00:44:41 +00:00