Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / arm / vp56_arith.h

diff --git a/libavcodec/arm/vp56_arith.h b/libavcodec/arm/vp56_arith.h
index 29a222844a8cb9a6ac215800aca766896fa28d22..feb1247916a8078b10ec7e7ef559e79dba329d7f 100644 (file)
--- a/libavcodec/arm/vp56_arith.h
+++ b/libavcodec/arm/vp56_arith.h
@@ -37,7 +37,7 @@
 #   define U(x)
 #endif
 
-#if HAVE_ARMV6 && HAVE_INLINE_ASM
+#if HAVE_ARMV6_INLINE
 
 #define vp56_rac_get_prob vp56_rac_get_prob_armv6
 static inline int vp56_rac_get_prob_armv6(VP56RangeCoder *c, int pr)