diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-22 22:26:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-22 22:26:42 +0200 |
| commit | 92ef4be4ab9fbb7d901b22e0036a4ca90b00a476 (patch) | |
| tree | c04ededf84f089de4f9ef417ca6ecc715b84fa4b /libavcodec/arm/vp8dsp_init_arm.c | |
| parent | 2e07f42957666df6d7c63a62263b8447e97b1442 (diff) | |
| parent | d526c5338d50d12a54fd95130030c60070707d3e (diff) | |
| download | ffmpeg-92ef4be4ab9fbb7d901b22e0036a4ca90b00a476.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: allow runtime masking of CPU features
dsputil: remove unused functions
mov: Treat keyframe indexes as 1-origin if starting at non-zero.
mov: Take stps entries into consideration also about key_off.
Remove lowres video decoding
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/libopenjpegdec.c
libavcodec/mjpegdec.c
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/vp8dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/vp8dsp_init_arm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/arm/vp8dsp_init_arm.c b/libavcodec/arm/vp8dsp_init_arm.c index 407dfd2cae..2b105dbe1d 100644 --- a/libavcodec/arm/vp8dsp_init_arm.c +++ b/libavcodec/arm/vp8dsp_init_arm.c @@ -17,6 +17,8 @@ */ #include <stdint.h> + +#include "libavutil/arm/cpu.h" #include "libavcodec/vp8dsp.h" void ff_vp8_luma_dc_wht_dc_armv6(DCTELEM block[4][4][16], DCTELEM dc[16]); @@ -301,7 +303,9 @@ av_cold void ff_vp8dsp_init_arm(VP8DSPContext *dsp) dsp->put_vp8_bilinear_pixels_tab[2][2][0] = ff_put_vp8_bilin4_v_##opt; \ dsp->put_vp8_bilinear_pixels_tab[2][2][1] = ff_put_vp8_bilin4_hv_##opt; \ dsp->put_vp8_bilinear_pixels_tab[2][2][2] = ff_put_vp8_bilin4_hv_##opt - if (HAVE_NEON) { + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags)) { set_func_ptrs(neon); } else if (HAVE_ARMV6) { set_func_ptrs(armv6); |