Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							faba79e080 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2011-07-30 06:46:08 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							ec6402b7c5 
							
						 
					 
					
						
						
							
							lavc: use designated initialisers for all codecs.  
						
						... 
						
						
						
						It's more readable and less prone to breakage. 
						
						
					 
					
						2011-07-29 08:42:34 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							56e11d2305 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  Drop git- prefix from version labels
  Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
  path64/open64: filter out unsupported flags
  Add Release Notes
  sipr: Drop unused DSPContext
  sipr: include string.h for mem*()
  sipr: Use memmove() to copy overlapped buffers.
  h264: drop some ugly casts
Conflicts:
	version.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2011-06-20 04:07:34 +02:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							4b84d5114d 
							
						 
					 
					
						
						
							
							sipr: Drop unused DSPContext  
						
						
						
						
					 
					
						2011-06-18 22:12:21 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							1e3d5eec8e 
							
						 
					 
					
						
						
							
							sipr: include string.h for mem*()  
						
						
						
						
					 
					
						2011-06-18 22:12:21 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							cb372931ff 
							
						 
					 
					
						
						
							
							sipr: Use memmove() to copy overlapped buffers.  
						
						
						
						
					 
					
						2011-06-18 22:12:21 -07: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 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							5d6e4c160a 
							
						 
					 
					
						
						
							
							Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum  
						
						... 
						
						
						
						SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-11-12 11:04:40 +00:00 
						 
				 
			
				
					
						
							
							
								Vitor Sessak 
							
						 
					 
					
						
						
						
						
							
						
						
							6e2ecc2dba 
							
						 
					 
					
						
						
							
							Remove pointless semicolon  
						
						... 
						
						
						
						Originally committed as revision 25141 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-09-17 19:33:56 +00:00 
						 
				 
			
				
					
						
							
							
								Marcelo Galvăo Póvoa 
							
						 
					 
					
						
						
						
						
							
						
						
							48ac225db2 
							
						 
					 
					
						
						
							
							Move lsp2lpc_sipr() function to common code so it can be reused in a  
						
						... 
						
						
						
						AMRWB decoder.
Patch by Marcelo Galvăo Póvoa.
Originally committed as revision 25062 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-09-07 20:46:29 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
						
						
							
						
						
							49bd8e4b84 
							
						 
					 
					
						
						
							
							Fix grammar errors in documentation  
						
						... 
						
						
						
						Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-06-30 15:38:06 +00:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
						
						
							
						
						
							b1078e9fe6 
							
						 
					 
					
						
						
							
							Move clipping of audio samples (for those codecs outputting float) from decoder  
						
						... 
						
						
						
						to the audio conversion routines.
Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-04-21 17:57:48 +00:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
						
						
							
						
						
							8955a9d79c 
							
						 
					 
					
						
						
							
							Split input/output data arguments to ff_acelp_apply_order_2_transfer_function().  
						
						... 
						
						
						
						Originally committed as revision 22933 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-04-21 17:45:24 +00:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
						
						
							
						
						
							bb2dd9efd8 
							
						 
					 
					
						
						
							
							Split the input/output data arguments to ff_adaptive_gain_control().  
						
						... 
						
						
						
						Originally committed as revision 22932 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-04-21 17:43:52 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							72415b2adb 
							
						 
					 
					
						
						
							
							Define AVMediaType enum, and use it instead of enum CodecType, which  
						
						... 
						
						
						
						is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-03-30 23:30:55 +00:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
						
						
							
						
						
							95c6b5ebc8 
							
						 
					 
					
						
						
							
							Fix spelling.  
						
						... 
						
						
						
						Originally committed as revision 22470 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-03-11 17:42:53 +00:00 
						 
				 
			
				
					
						
							
							
								Vitor Sessak 
							
						 
					 
					
						
						
						
						
							
						
						
							d140b02581 
							
						 
					 
					
						
						
							
							SIPR16k decoder  
						
						... 
						
						
						
						Originally committed as revision 21234 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-16 03:54:55 +00:00 
						 
				 
			
				
					
						
							
							
								Vitor Sessak 
							
						 
					 
					
						
						
						
						
							
						
						
							d79c06b2ad 
							
						 
					 
					
						
						
							
							Allow a SIPR table to be used by the upcoming SIPR16k decoder  
						
						... 
						
						
						
						Originally committed as revision 21233 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-16 03:44:17 +00:00 
						 
				 
			
				
					
						
							
							
								Vitor Sessak 
							
						 
					 
					
						
						
						
						
							
						
						
							65323ed279 
							
						 
					 
					
						
						
							
							Split some SIPR structs to a header file for the upcoming SIPR16k commit  
						
						... 
						
						
						
						Originally committed as revision 21232 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-16 03:40:25 +00:00 
						 
				 
			
				
					
						
							
							
								Vitor Sessak 
							
						 
					 
					
						
						
						
						
							
						
						
							ef5e7fb253 
							
						 
					 
					
						
						
							
							Remove needless use of log2f()  
						
						... 
						
						
						
						Originally committed as revision 21185 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-13 04:35:19 +00:00 
						 
				 
			
				
					
						
							
							
								Vitor Sessak 
							
						 
					 
					
						
						
						
						
							
						
						
							1c3c129b8f 
							
						 
					 
					
						
						
							
							Remove the struct SiprModeParam of the context. This will simplify splitting  
						
						... 
						
						
						
						the file for future 16k mode decoder code.
Originally committed as revision 21184 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-13 04:29:55 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
						
						
							
						
						
							f3da24c4c3 
							
						 
					 
					
						
						
							
							SIPR: kill variable-length arrays  
						
						... 
						
						
						
						Two of these are in fact constant size, so use the constant instead of
a variable in the declarations.  The remaining one is small enough
that always using the maximum size is acceptable.
Originally committed as revision 21183 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-13 03:11:02 +00:00 
						 
				 
			
				
					
						
							
							
								Vladimir Voroshilov 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd3096f5f 
							
						 
					 
					
						
						
							
							SIPR decoder for modes 8k5, 6k5 and 5k0.  
						
						... 
						
						
						
						Patch by Vladimir Voroshilov and myself.
Originally committed as revision 21125 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-10 21:38:15 +00:00