FFmpeg/libavresample
Michael Niedermayer 249fca3df9 Merge commit '074a00d192c0e749d677b008b337da42597e780f'
* commit '074a00d192c0e749d677b008b337da42597e780f':
  lavr: add a public function for setting a custom channel map
  lavr: typedef internal structs in internal.h
  doc: Extend commit message section

Conflicts:
	doc/APIchanges
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-08 12:56:41 +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-06 13:20:23 +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 avresample: use valid log context in mixing functions 2012-12-16 19:59:58 -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 lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
dither.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -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
Makefile lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
options.c lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52: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