diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:03:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:04:11 +0200 |
| commit | f9418d156fe641af50d05114a9787a3bdb579369 (patch) | |
| tree | 85db1ae696dfaba1b5603d412a57ac19d6391b37 /libavcodec/arm | |
| parent | b99d3613cfdb5714a3c0e18b0db209280d879a10 (diff) | |
| parent | 8506ff97c9ea4a1f52983497ecf8d4ef193403a9 (diff) | |
| download | android_external_ffmpeg-f9418d156fe641af50d05114a9787a3bdb579369.tar.gz android_external_ffmpeg-f9418d156fe641af50d05114a9787a3bdb579369.tar.bz2 android_external_ffmpeg-f9418d156fe641af50d05114a9787a3bdb579369.zip | |
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
vp56: Mark VP6-only optimizations as such.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/Makefile | 6 | ||||
| -rw-r--r-- | libavcodec/arm/vp6dsp_init_arm.c (renamed from libavcodec/arm/vp56dsp_init_arm.c) | 4 | ||||
| -rw-r--r-- | libavcodec/arm/vp6dsp_neon.S (renamed from libavcodec/arm/vp56dsp_neon.S) | 0 |
3 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 9c64b361f1..0e5e53a16a 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -25,8 +25,7 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_init_arm.o OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_arm.o OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_init_arm.o OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_init_arm.o -OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_init_arm.o -OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_init_arm.o +OBJS-$(CONFIG_VP6_DECODER) += arm/vp6dsp_init_arm.o OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_arm.o OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_init_arm.o OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \ @@ -89,7 +88,6 @@ NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_neon.o \ arm/rv40dsp_neon.o NEON-OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_neon.o NEON-OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_neon.o -NEON-OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_neon.o -NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_neon.o +NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp6dsp_neon.o NEON-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_neon.o \ arm/vp8dsp_neon.o diff --git a/libavcodec/arm/vp56dsp_init_arm.c b/libavcodec/arm/vp6dsp_init_arm.c index f53cbae1ed..ed6832145e 100644 --- a/libavcodec/arm/vp56dsp_init_arm.c +++ b/libavcodec/arm/vp6dsp_init_arm.c @@ -28,11 +28,11 @@ void ff_vp6_edge_filter_hor_neon(uint8_t *yuv, int stride, int t); void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, int stride, int t); -av_cold void ff_vp56dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec) +av_cold void ff_vp6dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec) { int cpu_flags = av_get_cpu_flags(); - if (codec != AV_CODEC_ID_VP5 && have_neon(cpu_flags)) { + if (have_neon(cpu_flags)) { s->edge_filter_hor = ff_vp6_edge_filter_hor_neon; s->edge_filter_ver = ff_vp6_edge_filter_ver_neon; } diff --git a/libavcodec/arm/vp56dsp_neon.S b/libavcodec/arm/vp6dsp_neon.S index 03dd28d1cb..03dd28d1cb 100644 --- a/libavcodec/arm/vp56dsp_neon.S +++ b/libavcodec/arm/vp6dsp_neon.S |