diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-04-21 15:31:10 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-04-22 12:30:45 +0100 |
| commit | d526c5338d50d12a54fd95130030c60070707d3e (patch) | |
| tree | 5cac97b8414872d2bdf977292e63ef8edf3eb49a /libavcodec/arm/vp56dsp_init_arm.c | |
| parent | d7458bc8c62ae1cb2ffc805b989fcddf4029dda6 (diff) | |
| download | ffmpeg-d526c5338d50d12a54fd95130030c60070707d3e.tar.gz | |
ARM: allow runtime masking of CPU features
This allows masking CPU features with the -cpuflags avconv option
which is useful for testing different optimisations without rebuilding.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/arm/vp56dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/vp56dsp_init_arm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/arm/vp56dsp_init_arm.c b/libavcodec/arm/vp56dsp_init_arm.c index 598960251a..691db584da 100644 --- a/libavcodec/arm/vp56dsp_init_arm.c +++ b/libavcodec/arm/vp56dsp_init_arm.c @@ -19,6 +19,8 @@ */ #include <stdint.h> + +#include "libavutil/arm/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/vp56dsp.h" @@ -27,7 +29,9 @@ void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, int stride, int t); void ff_vp56dsp_init_arm(VP56DSPContext *s, enum CodecID codec) { - if (codec != CODEC_ID_VP5 && HAVE_NEON) { + int cpu_flags = av_get_cpu_flags(); + + if (codec != CODEC_ID_VP5 && have_neon(cpu_flags)) { s->edge_filter_hor = ff_vp6_edge_filter_hor_neon; s->edge_filter_ver = ff_vp6_edge_filter_ver_neon; } |