Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 10:46:13 +0000 (12:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 10:46:13 +0000 (12:46 +0200)
* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
  arm: Macroize the test for 'setend' CPU instruction support

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/h264dsp_init_arm.c
libavutil/arm/cpu.h

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