Michael Niedermayer ebb21887b8 Merge commit '01c5779f56' ... * commit '01c5779f56': x86: Drop some unnecessary YASM ifdefs Conflicts: libavfilter/x86/vf_yadif_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-04-05 19:16:39 +02:00
..
aarch64	Merge remote-tracking branch 'qatar/master'	2014-01-15 15:49:22 +01:00
arm	Merge commit '5bcbb516f2'	2014-02-08 00:48:26 +01:00
x86	Merge commit '01c5779f56'	2014-04-05 19:16:39 +02:00
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix.c	Merge commit 'cc976a75df'	2014-01-04 02:30:07 +01:00
audio_mix.h
audio_mix_matrix.c	Merge commit '76a75c523c'	2014-02-08 18:38:17 +01:00
avresample-test.c
avresample.h	Merge commit '7e86c27b4e'	2014-02-22 21:06:02 +01:00
avresampleres.rc	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
dither.c
dither.h
internal.h
libavresample.v
Makefile	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
options.c	Merge remote-tracking branch 'qatar/master'	2013-11-24 05:21:19 +01:00
resample.c
resample.h
resample_template.c	Merge commit 'aba70bb538'	2014-03-26 14:50:55 +01:00
utils.c	Merge remote-tracking branch 'qatar/master'	2014-02-22 21:12:02 +01:00
version.h	Merge commit '7e86c27b4e'	2014-02-22 21:06:02 +01:00