diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-24 10:32:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-24 10:35:39 +0200 |
| commit | 1ea28ffc4dbcdda64dc2e774c186f668ef7b030f (patch) | |
| tree | d83681ad83339e990f72a6892e5bcf867601e557 /libavfilter/x86/Makefile | |
| parent | 04916953584332b457a9485eee0724f33bbb9ba8 (diff) | |
| parent | 0e730494160d973400aed8d2addd1f58a0ec883e (diff) | |
| download | ffmpeg-1ea28ffc4dbcdda64dc2e774c186f668ef7b030f.tar.gz | |
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>
Diffstat (limited to 'libavfilter/x86/Makefile')
| -rw-r--r-- | libavfilter/x86/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile index b15c5628c4..6a252b40bf 100644 --- a/libavfilter/x86/Makefile +++ b/libavfilter/x86/Makefile @@ -1,10 +1,11 @@ -OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o +OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun_init.o OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d_init.o OBJS-$(CONFIG_PULLUP_FILTER) += x86/vf_pullup_init.o OBJS-$(CONFIG_SPP_FILTER) += x86/vf_spp.o OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume_init.o OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif_init.o +YASM-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o YASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o YASM-OBJS-$(CONFIG_PULLUP_FILTER) += x86/vf_pullup.o YASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o |