Michael Niedermayer 46ad2d9e44 Merge remote-tracking branch 'qatar/master' ... * qatar/master: miscellaneous typo fixes Conflicts: configure libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-07-26 11:12:11 +02:00
..
arm
x86	Merge remote-tracking branch 'qatar/master'	2013-07-18 09:53:47 +02:00
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix_matrix.c
audio_mix.c
audio_mix.h
avresample-test.c	miscellaneous typo fixes	2013-07-25 19:43:32 +02:00
avresample.h
dither.c
dither.h
internal.h
libavresample.v
Makefile
options.c
resample_template.c
resample.c
resample.h
utils.c
version.h