Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							1842b27564 
							
						 
					 
					
						
						
							
							lavu: 256 color support  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-07-07 01:41:55 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							10d2a4028c 
							
						 
					 
					
						
						
							
							swresample: make .class_name more descriptive  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-06-22 14:01:15 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							634d539c12 
							
						 
					 
					
						
						
							
							swresample.c: update copyleft year  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-06-12 16:11:17 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							75d900d52e 
							
						 
					 
					
						
						
							
							swr: zero buffers on allocation  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-06-09 02:42:46 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64df092b25 
							
						 
					 
					
						
						
							
							swr: fix a few typo.  
						
						
						
						
					 
					
						2012-06-01 08:06:36 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							16e25ef34b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  avconv: extend -r to work on any input stream.
  doc/avconv: expand documentation for the -s option.
  avconv: don't print filters inserted by avconv in stream mappings.
  avconv: merge configuration code for complex and simple filters
  avconv: split configuring input filters out of configure_complex_filter
Conflicts:
	configure
	doc/ffmpeg.texi
	ffmpeg.c
	tests/ref/fate/idroq-video-encode
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-30 04:38:32 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							72261fa867 
							
						 
					 
					
						
						
							
							swr: fix swr_drop_output()  
						
						... 
						
						
						
						Fixes part of Ticket1341
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-26 02:33:38 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							841c1be57e 
							
						 
					 
					
						
						
							
							swr: check return value of swr_inject_silence/drop_output.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-22 20:37:12 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a645049bd8 
							
						 
					 
					
						
						
							
							swr: check count argument of realloc_audio()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-22 20:37:12 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							d1384c00d4 
							
						 
					 
					
						
						
							
							swr: skip soft compensation when its disabled.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 22:42:32 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							72a242c998 
							
						 
					 
					
						
						
							
							swr: add swr_next_pts()  
						
						... 
						
						
						
						parameter descriptions partly reuse text from af_asyncts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							f88f705abc 
							
						 
					 
					
						
						
							
							swr: add swr_drop_output()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							7a59964ba9 
							
						 
					 
					
						
						
							
							swr: add swr_inject_silence()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							72872d0201 
							
						 
					 
					
						
						
							
							swr: Fix issue with injecting more data than can be used up in the next call.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							c5c355546d 
							
						 
					 
					
						
						
							
							swr: add some asserts to resample()  
						
						... 
						
						
						
						These check that the internal and input buffers match in format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							75e25f8540 
							
						 
					 
					
						
						
							
							swr: add reversefill_audiodata()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							5027e3daf7 
							
						 
					 
					
						
						
							
							swr: fix buf_set() so it works with input == output  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							bdbfd4569d 
							
						 
					 
					
						
						
							
							swr: make literal 32 a named constant in realloc_audio()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							186be49fd5 
							
						 
					 
					
						
						
							
							swr: fill_audio_data() support NULL  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-19 19:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a0493be10e 
							
						 
					 
					
						
						
							
							swresample: set the default parameters to "none"  
						
						... 
						
						
						
						this way it can easily be detected when parameters have not been set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-17 16:46:15 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							33f7033452 
							
						 
					 
					
						
						
							
							swr: automatically choose s16/flt/dbl to preserve input precision unless user overrides.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-02 01:12:16 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							f2e799a3d0 
							
						 
					 
					
						
						
							
							swr: add double precision support to the rematrix code  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-02 01:12:16 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							71a1f76d3c 
							
						 
					 
					
						
						
							
							swr: update double precision checks for our resampler  
						
						... 
						
						
						
						It supports double precision since a while
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-02 01:12:16 +02:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							6d5bf67f04 
							
						 
					 
					
						
						
							
							swr: add lfe_mix_level  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-02 01:12:10 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							aab5a4521c 
							
						 
					 
					
						
						
							
							swr: add and use function pointers for rematrix  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-01 20:20:21 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							00fea26faf 
							
						 
					 
					
						
						
							
							swr: add native matrix for rematrixing  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-01 20:19:28 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							046b5339fc 
							
						 
					 
					
						
						
							
							swr: disable 1 stage convert when dither is enabled.  
						
						... 
						
						
						
						This combination is not possible easily.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-05-01 20:12:31 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							106789dfa0 
							
						 
					 
					
						
						
							
							swr: add sample format to AudioData  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-29 15:32:18 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							2d6c29f566 
							
						 
					 
					
						
						
							
							swr: add set_audiodata_fmt() and use it to simplify code  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-29 15:32:18 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							edbde52226 
							
						 
					 
					
						
						
							
							swr: change sample format representation so as to maintain the planer/packed distinction.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-28 13:02:58 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							da9587952a 
							
						 
					 
					
						
						
							
							swr: pass resample parameters from the user to the resampler.  
						
						... 
						
						
						
						doxy and names stolen from avr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-26 01:35:22 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a522e03754 
							
						 
					 
					
						
						
							
							swr: Add longer more descriptive alternative AVOptions.  
						
						... 
						
						
						
						They match avresample where it supports the same fields.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-26 01:14:48 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							20fc610439 
							
						 
					 
					
						
						
							
							swr: Capitalize help texts for AVOptions  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-26 01:03:32 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							36a9dd2f4d 
							
						 
					 
					
						
						
							
							swr: align options a little  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-26 01:00:43 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							23282c2222 
							
						 
					 
					
						
						
							
							swr: set AV_OPT_FLAG_AUDIO_PARAM for the AVOptions  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-26 00:51:50 +02:00 
						 
				 
			
				
					
						
							
							
								Andrew Wason 
							
						 
					 
					
						
						
						
						
							
						
						
							e9b1d5ae5e 
							
						 
					 
					
						
						
							
							fix swr_convert buffering of packed audio  
						
						... 
						
						
						
						swr_convert is not properly buffering packed input audio when the
output is not large enough, and when resampling is not actually needed
(same samplerate and no SWR_FLAG_RESAMPLE).
buf_set() is only handling the first channel and leaving the others as-is.
Sample program to reproduce the problem is here https://gist.github.com/2431768 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-21 01:57:21 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							44239bd9f2 
							
						 
					 
					
						
						
							
							swr: add a swr_flags AVOption  
						
						... 
						
						
						
						Using swr_flags instead of plain flags will avoid conflicts that
arise with plain flags and multiple libs (which all have AVOption flags)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-11 14:10:22 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							c1d404b9e4 
							
						 
					 
					
						
						
							
							swr: add a dither_scale parameter to tune the amplitude of the dither.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-11 13:44:48 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a2c92e6063 
							
						 
					 
					
						
						
							
							swr: pass context to swri_get_dither()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-11 13:44:15 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							f8a237a307 
							
						 
					 
					
						
						
							
							swr: add triangular highpass dither  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-11 13:27:22 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							1fc4ff2205 
							
						 
					 
					
						
						
							
							swr: generate more dither noise to improve quality.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-11 13:26:32 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							22057e8ecb 
							
						 
					 
					
						
						
							
							swr: add swr_get_class()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-11 13:25:56 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							b1ef4dc406 
							
						 
					 
					
						
						
							
							swr: add triangular dither support  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-10 21:18:33 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0cff3e130b 
							
						 
					 
					
						
						
							
							swr: remove unused variable  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-10 21:18:32 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0170889372 
							
						 
					 
					
						
						
							
							swr: add SWR_DITHER_RECTANGULAR to AVOptions array  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-10 21:18:32 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							db2eadb2f5 
							
						 
					 
					
						
						
							
							swr: add dither support.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-10 19:54:41 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							3d9338b1c2 
							
						 
					 
					
						
						
							
							swr: support int32 and float as internal sample formats  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-10 13:19:29 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							7f1ae79d38 
							
						 
					 
					
						
						
							
							swr: support float & int32 in the resampler  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-10 13:18:49 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							87688727e4 
							
						 
					 
					
						
						
							
							swr: remove unused variable  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-01 22:11:34 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							dc984da961 
							
						 
					 
					
						
						
							
							swr: fix pointer type warnings  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-01 22:10:40 +02:00