1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libavresample
Michael Niedermayer 5f8f9dc436 Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'
* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
  configure: Move x11grab option to a more suitable place in the help output
  lavr: allow setting internal_sample_fmt option by string
  lavr: Add "resample_cutoff" option as a duplicate of "cutoff"

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 17:45:06 +01:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2013-01-09 12:30:14 +01:00
audio_convert.c lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
audio_convert.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
audio_data.c lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
audio_data.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
audio_mix_matrix.c lavr: temporarily store custom matrix in AVAudioResampleContext 2012-12-11 14:00:32 -05:00
audio_mix.c lavr: fix mixing matrix reduction when normalization is disabled 2013-02-12 13:41:13 -05:00
audio_mix.h lavr: typedef internal structs in internal.h 2013-01-07 21:49:05 -05:00
avresample-test.c miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
avresample.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
dither.c x86: lavr: add SSE2 quantize() for dithering 2013-01-08 14:52:43 -05:00
dither.h x86: lavr: add SSE2 quantize() for dithering 2013-01-08 14:52:43 -05:00
internal.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
libavresample.v Add libavresample 2012-04-24 21:28:27 -04:00
Makefile lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
options.c lavr: allow setting internal_sample_fmt option by string 2013-02-23 17:07:54 -05:00
resample_template.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
resample.c lavr: typedef internal structs in internal.h 2013-01-07 21:49:05 -05:00
resample.h lavr: typedef internal structs in internal.h 2013-01-07 21:49:05 -05:00
utils.c Merge commit '074a00d192c0e749d677b008b337da42597e780f' 2013-01-08 12:56:41 +01:00
version.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00