Michael Niedermayer 6f373d75e8 Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc' ... * commit '2e1704059ae8625beda2ffde847ad22c5ba416dc': vf_interlace: Add SIMD for lowpass filter Conflicts: libavfilter/vf_interlace.c libavfilter/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-11-15 02:39:49 +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 '2e1704059ae8625beda2ffde847ad22c5ba416dc'	2014-11-15 02:39:49 +01:00
vf_gradfun_init.c	Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'"	2013-11-01 14:28:08 +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_idet_init.c	av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()	2014-09-09 16:47:22 +02:00
vf_idet.asm	av_filter/x86/idet: use HADDD where appropriate	2014-09-09 19:02:49 -03:00
vf_interlace_init.c	Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'	2014-11-15 02:39:49 +01:00
vf_interlace.asm	Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'	2014-11-15 02:39:49 +01:00
vf_noise.c	x86/vf_noise: move asm code to a separate file	2014-10-17 00:44:35 -03:00
vf_pullup_init.c	avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions	2014-06-25 18:22:31 +02:00
vf_pullup.asm	avfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" with nasm	2014-06-28 16:06:00 +02:00
vf_spp.c	lavfi: add spp filter.	2013-06-14 01:27:22 +02:00
vf_yadif_init.c	Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'	2014-04-05 19:16:39 +02:00
vf_yadif.asm	x86util: add and use RSHIFT/LSHIFT macros	2014-06-15 13:19:27 +02:00
yadif-10.asm	x86/yadif-10: remove duplicate ABS macro	2014-07-10 21:06:51 +02:00
yadif-16.asm	fix spelling errors	2014-07-12 22:33:27 +02:00