Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

* 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>

diff --cc libavcodec/arm/h264dsp_init_arm.c
index 3999e993ab92fb98cafd03ac0a14ded856248ea6,7cb1312c2babf9906e2fdc5582d6010bbe8e92ca..2027d1861eecebb6b466da188c3b8a7d69961918
--- 1/libavcodec/arm/h264dsp_init_arm.c
--- 2/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c
@@@ -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);
  }

diff --cc libavutil/arm/cpu.h
Simple merge