Michael Niedermayer ffe3350098 Merge commit 'ee80cf741a44115758e62399b7bde08d33161151' ... * commit 'ee80cf741a44115758e62399b7bde08d33161151': avfilter: x86: K&R formatting cosmetics Conflicts: libavfilter/x86/vf_gradfun_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-11-01 10:20:20 +01:00
..
af_volume_init.c	Merge remote-tracking branch 'qatar/master'	2013-07-18 09:53:47 +02:00
af_volume.asm
Makefile	Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'	2013-10-24 10:35:39 +02:00
vf_gradfun_init.c	Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'	2013-11-01 10:20:20 +01:00
vf_gradfun.asm	Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'	2013-10-24 10:35:39 +02:00
vf_hqdn3d_init.c	Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'	2013-11-01 10:20:20 +01:00
vf_hqdn3d.asm
vf_pullup_init.c	avfilter: port pullup filter from libmpcodecs	2013-09-17 17:03:36 +00:00
vf_pullup.asm	avfilter/x86/vf_pullup: try to fix build on x64	2013-09-17 17:20:58 +00:00
vf_spp.c
vf_yadif_init.c
vf_yadif.asm
yadif-10.asm
yadif-16.asm