Michael Niedermayer 1ea28ffc4d Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e' ...

* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-10-24 10:35:39 +02:00

..

af_volume_init.c

…

af_volume.asm

…

Makefile

Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'

2013-10-24 10:35:39 +02:00

vf_gradfun_init.c

Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'

2013-10-24 10:35:39 +02:00

vf_gradfun.asm

Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'

2013-10-24 10:35:39 +02:00

vf_hqdn3d_init.c

…

vf_hqdn3d.asm

…

vf_pullup_init.c

…

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

…