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

…

af_volume.asm

…

Makefile

Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'

2014-11-15 02:39:49 +01:00

vf_gradfun_init.c

…

vf_gradfun.asm

…

vf_hqdn3d_init.c

…

vf_hqdn3d.asm

…

vf_idet_init.c

…

vf_idet.asm

…

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

…

vf_pullup_init.c

…

vf_pullup.asm

…

vf_spp.c

…

vf_yadif_init.c

…

vf_yadif.asm

…

yadif-10.asm

…

yadif-16.asm

…