Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						dd8ffc1925 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master: (47 commits)
  lavc: hide private symbols.
  lavc: deprecate img_get_alpha_info().
  lavc: use avpriv_ prefix for ff_toupper4.
  lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
  lavc: use avpriv_ prefix for ff_ac3_parse_header.
  lavc: use avpriv_ prefix for ff_frame_rate_tab.
  lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
  lavc: use avpriv_ prefix for ff_split_xiph_headers.
  lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
  lavc: use avpriv_ prefix for some dv symbols used in lavf.
  lavc: use avpriv_ prefix for some flac symbols used in lavf.
  lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
  lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
  lavc: use avpriv_ prefix for ff_aac_parse_header().
  lavf: hide private symbols.
  lavf: use avpriv_ prefix for some dv functions.
  lavf: use avpriv_ prefix for ff_new_chapter().
  avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
  avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
  avcodec: clarify documentation of CODEC_CAP_DELAY
  ...
Conflicts:
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/dv.c
	libavcodec/dvdata.c
	libavcodec/dvdata.h
	libavcodec/libspeexenc.c
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavformat/avidec.c
	libavformat/dv.c
	libavformat/dv.h
	libavformat/flvenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/oggparsespeex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-10-21 02:01:26 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						9138a130cd 
					 
					
						
						
							
							lavc: use avpriv_ prefix for ff_frame_rate_tab.  
						
						... 
						
						
						
						It's used in lavf. 
						
						
					 
					
						2011-10-20 21:06:58 +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 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 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						987903826b 
					 
					
						
						
							
							Globally rename the header inclusion guard names.  
						
						... 
						
						
						
						Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-08-31 07:39:47 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						245976da2a 
					 
					
						
						
							
							Use full path for #includes from another directory.  
						
						... 
						
						
						
						Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-05-09 11:56:36 +00:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
							
						
						3bfe9260fa 
					 
					
						
						
							
							move relevant declarations to mpeg12data.h  
						
						... 
						
						
						
						Originally committed as revision 12320 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-03-05 00:06:09 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						5b21bdabe4 
					 
					
						
						
							
							Add FFMPEG_ prefix to all multiple inclusion guards.  
						
						... 
						
						
						
						Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-10-17 09:37:46 +00:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
							
						
						eaa7557c73 
					 
					
						
						
							
							add proper ff_ prefix to new extern symbols  
						
						... 
						
						
						
						Originally committed as revision 9479 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-07-05 09:21:55 +00:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
							
						
						a6bc573158 
					 
					
						
						
							
							split mpeg12 encoder out of mpeg12.c  
						
						... 
						
						
						
						Originally committed as revision 9477 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-07-05 09:08:28 +00:00 
						 
				 
			
				
					
						
							
							
								Guillaume Poirier 
							
						 
					 
					
						
						
							
						
						efb775777f 
					 
					
						
						
							
							add a comment to indicate which #endif belong to which #define  
						
						... 
						
						
						
						Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-17 18:59:28 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						699b3f99d0 
					 
					
						
						
							
							add multiple inclusion guards to headers  
						
						... 
						
						
						
						Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-17 00:01:30 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						99545457bf 
					 
					
						
						
							
							include all prerequisites in header files  
						
						... 
						
						
						
						Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-16 22:59:13 +00:00 
						 
				 
			
				
					
						
							
							
								Baptiste Coudurier 
							
						 
					 
					
						
						
							
						
						5a6b9443ed 
					 
					
						
						
							
							dummy support for mpeg2 non linear quant  
						
						... 
						
						
						
						Originally committed as revision 8215 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-03-04 02:26:20 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						7b7abda3b3 
					 
					
						
						
							
							make more tables static  
						
						... 
						
						
						
						Originally committed as revision 6996 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-11-12 23:14:20 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						b78e7197a8 
					 
					
						
						
							
							Change license headers to say 'FFmpeg' instead of 'this program/this library'  
						
						... 
						
						
						
						and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-10-07 15:30:46 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						191e8ca752 
					 
					
						
						
							
							fix some signedness warnings  
						
						... 
						
						
						
						Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-09-27 19:47:39 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						04d7f60143 
					 
					
						
						
							
							Add official LGPL license headers to the files that were missing them.  
						
						... 
						
						
						
						Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-09-10 14:02:42 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						ed4e20ac7f 
					 
					
						
						
							
							Fix some "'static' is not at beginning of declaration" warnings.  
						
						... 
						
						
						
						Originally committed as revision 5956 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-08-08 10:24:26 +00:00 
						 
				 
			
				
					
						
							
							
								Stefan Gehrer 
							
						 
					 
					
						
						
							
						
						761089b028 
					 
					
						
						
							
							staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)  
						
						... 
						
						
						
						Originally committed as revision 5578 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-07-02 14:50:23 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						bb270c0896 
					 
					
						
						
							
							COSMETICS: tabs --> spaces, some prettyprinting  
						
						... 
						
						
						
						Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2005-12-22 01:10:11 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						115329f160 
					 
					
						
						
							
							COSMETICS: Remove all trailing whitespace.  
						
						... 
						
						
						
						Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2005-12-17 18:14:38 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c26ae41db2 
					 
					
						
						
							
							adding a few const  
						
						... 
						
						
						
						Originally committed as revision 4337 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2005-06-01 21:19:00 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						60f41d13ef 
					 
					
						
						
							
							10000l  
						
						... 
						
						
						
						Originally committed as revision 3094 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2004-04-30 16:06:20 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8aedc51d2b 
					 
					
						
						
							
							simplify  
						
						... 
						
						
						
						Originally committed as revision 3085 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2004-04-27 13:50:41 +00:00 
						 
				 
			
				
					
						
							
							
								Ivan Kalvachev 
							
						 
					 
					
						
						
							
						
						461cd5bfb5 
					 
					
						
						
							
							add vlc for cbp=0 that is valid in 422,444  
						
						... 
						
						
						
						Originally committed as revision 2838 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2004-03-02 18:39:25 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8d52ec7eb0 
					 
					
						
						
							
							AVCodec.supported_framerates  
						
						... 
						
						
						
						Originally committed as revision 2821 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2004-02-26 18:29:39 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						baaf3f467b 
					 
					
						
						
							
							SVCD scan offset stuff  
						
						... 
						
						
						
						Originally committed as revision 2660 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2004-01-04 00:23:14 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b40cd4e0e4 
					 
					
						
						
							
							rv20 (h263) b frame decoding support  
						
						... 
						
						
						
						Originally committed as revision 2561 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-12-04 18:34:47 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						5ff85f1d8b 
					 
					
						
						
							
							AVRational  
						
						... 
						
						
						
						sample_aspect_ratio
aspect ratio in JPEG JFIF is SAR not DAR !
removed nonsense SAR guessing code
various related cleanups
bugs?
Originally committed as revision 2403 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-10-20 20:23:46 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2a250222e6 
					 
					
						
						
							
							CONFIG_ENCODERS cleanup  
						
						... 
						
						
						
						Originally committed as revision 1984 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-06-22 11:08:22 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						9c00c3af90 
					 
					
						
						
							
							100l (mpeg2 decoding fixed)  
						
						... 
						
						
						
						Originally committed as revision 1756 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-04-11 21:15:17 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7bc9090a41 
					 
					
						
						
							
							simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture  
						
						... 
						
						
						
						more direct use of the new mb_type stuff instead of codec specific stuff
runtime mb_type debug output h264/h263 variants/mpeg1/2/4
error concealment /resilience for mpeg1/2
various minor optimizations
Originally committed as revision 1746 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-04-10 13:18:38 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						14bea432f1 
					 
					
						
						
							
							per context frame_rate_base, this should finally fix frame_rate related av sync issues  
						
						... 
						
						
						
						Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-03-12 15:16:19 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						983e3246b7 
					 
					
						
						
							
							per file doxy  
						
						... 
						
						
						
						Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-03-06 11:32:04 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a5dbb247af 
					 
					
						
						
							
							fixing inaccurate frame_rate  
						
						... 
						
						
						
						Originally committed as revision 1616 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-03-01 00:16:00 +00:00 
						 
				 
			
				
					
						
							
							
								Zdenek Kabelac 
							
						 
					 
					
						
						
							
						
						0c1a9edad4 
					 
					
						
						
							
							* UINTX -> uintx_t   INTX -> intx_t  
						
						... 
						
						
						
						Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-02-11 16:35:48 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						945f15b740 
					 
					
						
						
							
							mpeg1&2 aspect decoding  
						
						... 
						
						
						
						Originally committed as revision 1318 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-12-06 16:04:30 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2ad1516a6c 
					 
					
						
						
							
							idct permutation cleanup, idct can be selected per context now  
						
						... 
						
						
						
						fixing some threadunsafe code
Originally committed as revision 980 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-09-29 22:44:22 +00:00 
						 
				 
			
				
					
						
							
							
								Marko Kreen 
							
						 
					 
					
						
						
							
						
						adc09b2eab 
					 
					
						
						
							
							adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)  
						
						... 
						
						
						
						Originally committed as revision 739 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-07-10 21:01:45 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8f8402e49c 
					 
					
						
						
							
							dc scale simplification/optimization  
						
						... 
						
						
						
						Originally committed as revision 695 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-06-18 00:46:02 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f004ca1c1b 
					 
					
						
						
							
							optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)  
						
						... 
						
						
						
						Originally committed as revision 298 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-02-13 15:26:28 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						80feb2a23e 
					 
					
						
						
							
							optimize mpeg1_encode_block()  
						
						... 
						
						
						
						(makeing some constant arrays global, merging put_bits(), ...)
Originally committed as revision 297 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-02-13 04:19:10 +00:00 
						 
				 
			
				
					
						
							
							
								Fabrice Bellard 
							
						 
					 
					
						
						
							
						
						1a56543279 
					 
					
						
						
							
							win32 fixes  
						
						... 
						
						
						
						Originally committed as revision 84 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2001-08-13 21:48:05 +00:00 
						 
				 
			
				
					
						
							
							
								Fabrice Bellard 
							
						 
					 
					
						
						
							
						
						689b775b85 
					 
					
						
						
							
							updated scans  
						
						... 
						
						
						
						Originally committed as revision 50 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2001-08-07 22:47:28 +00:00 
						 
				 
			
				
					
						
							
							
								Fabrice Bellard 
							
						 
					 
					
						
						
							
						
						98be975df1 
					 
					
						
						
							
							types fix  
						
						... 
						
						
						
						Originally committed as revision 36 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2001-08-06 00:47:50 +00:00 
						 
				 
			
				
					
						
							
							
								Arpi 
							
						 
					 
					
						
						
							
						
						4af7bcc185 
					 
					
						
						
							
							MMX/MMXEXT iDCT support, using external functions currently defined in libmpeg2  
						
						... 
						
						
						
						Gives average 13-20% mpeg decoding speedup on x86 systems.
Originally committed as revision 30 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2001-08-03 18:33:03 +00:00 
						 
				 
			
				
					
						
							
							
								Fabrice Bellard 
							
						 
					 
					
						
						
							
						
						de6d9b6404 
					 
					
						
						
							
							Initial revision  
						
						... 
						
						
						
						Originally committed as revision 5 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2001-07-22 14:18:56 +00:00