Merge remote-tracking branch 'hexene/stagefright'

[ffmpeg] / libavutil / arm / intmath.h

diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h
index efe3915350018fdea7a3817b9fa20129abb9b0c8..52af66e722deed40f97cdf161dd8fdf6ae26be77 100644 (file)
--- a/libavutil/arm/intmath.h
+++ b/libavutil/arm/intmath.h
@@ -106,7 +106,7 @@ static av_always_inline av_const int32_t av_clipl_int32_arm(int64_t a)
              "mvnne  %1, #1<<31             \n\t"
              "moveq  %0, %Q2                \n\t"
              "eorne  %0, %1,  %R2, asr #31  \n\t"
-             : "=r"(x), "=&r"(y) : "r"(a));
+             : "=r"(x), "=&r"(y) : "r"(a):"cc");
     return x;
 }