diff options
| author | Ben Avison <bavison@riscosopen.org> | 2014-07-21 14:53:06 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-21 15:08:01 -0700 |
| commit | 6869612f5c7d4d2f20f69a5658328a761deadb1c (patch) | |
| tree | c429c4f8267299bbcbeb5986cda008e7e1d74d64 /libavcodec/arm | |
| parent | 16e6652286213014c28a9c3af70435e767d28638 (diff) | |
arm: Macroize the test for 'setend' CPU instruction support
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index f9712d8102..7cb1312c2b 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -104,12 +104,8 @@ av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, { int cpu_flags = av_get_cpu_flags(); - if (have_armv6(cpu_flags) && !(have_vfpv3(cpu_flags) || have_neon(cpu_flags))) { - // This function uses the 'setend' instruction which is deprecated - // on ARMv8. This instruction is serializing on some ARMv7 cores as - // well. Therefore, only use the function on ARMv6. + if (have_setend(cpu_flags)) c->h264_find_start_code_candidate = ff_h264_find_start_code_candidate_armv6; - } if (have_neon(cpu_flags)) h264dsp_init_neon(c, bit_depth, chroma_format_idc); } |