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
..
Makefile	Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c""	2014-01-14 14:19:14 +01:00
af_volume.asm	…
af_volume_init.c	…
vf_gradfun.asm	Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'	2013-10-24 10:35:39 +02:00
vf_gradfun_init.c	Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'"	2013-11-01 14:28:08 +01:00
vf_hqdn3d.asm	…
vf_hqdn3d_init.c	Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'	2013-11-01 10:20:20 +01:00
vf_pullup.asm	…
vf_pullup_init.c	…
vf_spp.c	…
vf_yadif.asm	Change license of yadif from GPL to LGPL	2014-01-14 14:19:15 +01:00
vf_yadif_init.c	Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'	2014-04-05 19:16:39 +02:00
yadif-10.asm	Change license of yadif from GPL to LGPL	2014-01-14 14:19:15 +01:00
yadif-16.asm	Change license of yadif from GPL to LGPL	2014-01-14 14:19:15 +01:00