diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 14:44:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 14:44:12 +0200 |
| commit | 1f935c3d0b8ca8659974afc02ebdf058dd99cd9c (patch) | |
| tree | 664caa74714de97934cc1937d3d215baf9a8cf8a /libavcodec/arm | |
| parent | 70b423e1484f178c40f04b6040349a08aff31f96 (diff) | |
| parent | 79fce1ec8abd017593c003917fc123f7119a78d6 (diff) | |
| download | ffmpeg-1f935c3d0b8ca8659974afc02ebdf058dd99cd9c.tar.gz | |
Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'
* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
arm: Avoid using the 'setend' instruction on ARMv7 and newer
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index eb6c514727..3999e993ab 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -108,8 +108,12 @@ 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)) + 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. c->h264_find_start_code_candidate = ff_startcode_find_candidate_armv6; + } if (have_neon(cpu_flags)) h264dsp_init_neon(c, bit_depth, chroma_format_idc); } |