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>

libavcodec/arm/h264dsp_init_arm.c

@@ -108,12 +108,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_startcode_find_candidate_armv6;
-    }
     if (have_neon(cpu_flags))
         h264dsp_init_neon(c, bit_depth, chroma_format_idc);
 }

libavutil/arm/cpu.h

@@ -30,4 +30,10 @@
 #define have_vfpv3(flags)   CPUEXT(flags, VFPV3)
 #define have_neon(flags)    CPUEXT(flags, NEON)
 
+/* Some functions use the 'setend' instruction which is deprecated on ARMv8
+ * and serializing on some ARMv7 cores. This macro ensures such functions
+ * are only enabled on ARMv6. */
+#define have_setend(flags)                                              \
+    (have_armv6(flags) && !(have_vfpv3(flags) || have_neon(flags)))
+
 #endif /* AVUTIL_ARM_CPU_H */