Michael Niedermayer 63a97d5674 Merge commit 'b6649ab503' ... * commit 'b6649ab503': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-03-28 11:20:41 +01:00
..
arm
x86	Merge commit 'b6649ab503'	2013-03-28 11:20:41 +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.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
audio_mix_matrix.c	lavr: temporarily store custom matrix in AVAudioResampleContext	2012-12-11 14:00:32 -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
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.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
resample_template.c
utils.c	Merge commit '074a00d192'	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