Michael Niedermayer 63a97d5674 Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' ... * commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': 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 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'	2013-03-28 11:20:41 +01:00
Makefile	…
audio_convert.c	…
audio_convert.h	…
audio_data.c	…
audio_data.h	…
audio_mix.c	…
audio_mix.h	…
audio_mix_matrix.c	…
avresample-test.c	…
avresample.h	…
dither.c	…
dither.h	…
internal.h	…
libavresample.v	…
options.c	lavr: allow setting internal_sample_fmt option by string	2013-02-23 17:07:54 -05:00
resample.c	…
resample.h	…
resample_template.c	…
utils.c	…
version.h	…