Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 12:44:12 +0000 (14:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 12:44:12 +0000 (14:44 +0200)
* 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>
1  2 
libavcodec/arm/h264dsp_init_arm.c

@@@ -108,8 -104,12 +108,12 @@@ av_cold void ff_h264dsp_init_arm(H264DS
  {
      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_h264_find_start_code_candidate_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);
  }