diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 11:56:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 11:56:48 +0100 |
| commit | 0b6f34cc9f281725fe7aeb011add88e896a2ec81 (patch) | |
| tree | 8bcb82cff3b7f61ab61cdd9f1fc56431382a23b9 /libavfilter/x86 | |
| parent | 103a2c2b1757ac89c48cb76e5f8b5272d0329521 (diff) | |
| parent | e66240f22e240b0f0d970d1b138db80ceb517097 (diff) | |
| download | ffmpeg-0b6f34cc9f281725fe7aeb011add88e896a2ec81.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter: x86: consistent filenames for filter optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/Makefile | 8 | ||||
| -rw-r--r-- | libavfilter/x86/vf_gradfun.c (renamed from libavfilter/x86/gradfun.c) | 0 | ||||
| -rw-r--r-- | libavfilter/x86/vf_hqdn3d.asm (renamed from libavfilter/x86/hqdn3d.asm) | 0 | ||||
| -rw-r--r-- | libavfilter/x86/vf_yadif.asm (renamed from libavfilter/x86/yadif.asm) | 0 | ||||
| -rw-r--r-- | libavfilter/x86/vf_yadif_init.c (renamed from libavfilter/x86/yadif_init.c) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile index af5a9998b5..59cefe8988 100644 --- a/libavfilter/x86/Makefile +++ b/libavfilter/x86/Makefile @@ -1,8 +1,8 @@ -OBJS-$(CONFIG_GRADFUN_FILTER) += x86/gradfun.o +OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d_init.o OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume_init.o -OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif_init.o +OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif_init.o -YASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/hqdn3d.o +YASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o YASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o -YASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif.o +YASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif.o diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/vf_gradfun.c index 214e764192..214e764192 100644 --- a/libavfilter/x86/gradfun.c +++ b/libavfilter/x86/vf_gradfun.c diff --git a/libavfilter/x86/hqdn3d.asm b/libavfilter/x86/vf_hqdn3d.asm index 961127e670..961127e670 100644 --- a/libavfilter/x86/hqdn3d.asm +++ b/libavfilter/x86/vf_hqdn3d.asm diff --git a/libavfilter/x86/yadif.asm b/libavfilter/x86/vf_yadif.asm index a8f798771f..a8f798771f 100644 --- a/libavfilter/x86/yadif.asm +++ b/libavfilter/x86/vf_yadif.asm diff --git a/libavfilter/x86/yadif_init.c b/libavfilter/x86/vf_yadif_init.c index dc14c67fdd..dc14c67fdd 100644 --- a/libavfilter/x86/yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c |