Michael Niedermayer ebb21887b8 Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8' ... * commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8': 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 '5bcbb516f2ff45290ef7995b081762e668693672'	2014-02-08 00:48:26 +01:00
x86	Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'	2014-04-05 19:16:39 +02:00
Makefile	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
audio_convert.c	…
audio_convert.h	…
audio_data.c	…
audio_data.h	…
audio_mix.c	Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'	2014-01-04 02:30:07 +01:00
audio_mix.h	…
audio_mix_matrix.c	Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'	2014-02-08 18:38:17 +01:00
avresample-test.c	…
avresample.h	Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'	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	…
options.c	…
resample.c	…
resample.h	…
resample_template.c	Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'	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 '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'	2014-02-22 21:06:02 +01:00