Michael Niedermayer a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' ... * commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays Conflicts: libavcodec/options_table.h libavfilter/avfilter.c libavformat/options_table.h libswscale/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-08-03 09:16:36 +02:00
..
arm	…
x86	Merge remote-tracking branch 'qatar/master'	2013-07-18 09:53:47 +02: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	miscellaneous typo fixes	2013-07-25 19:43:32 +02:00
avresample.h	…
dither.c	…
dither.h	…
internal.h	…
libavresample.v	…
options.c	Give less generic names to global library option arrays	2013-08-02 19:19:02 +02:00
resample.c	…
resample.h	…
resample_template.c	…
utils.c	…
version.h	…