Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / arm / mathops.h

diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h
index 299a973cb6d702442ab0a33a0a792ee95c1d65dc..d67714c496b415e207497d306602b85320cf59cb 100644 (file)
--- a/libavcodec/arm/mathops.h
+++ b/libavcodec/arm/mathops.h
@@ -64,11 +64,14 @@ static inline av_const int mid_pred(int a, int b, int c)
     __asm__ (
         "mov   %0, %2  \n\t"
         "cmp   %1, %2  \n\t"
+        "itt   gt      \n\t"
         "movgt %0, %1  \n\t"
         "movgt %1, %2  \n\t"
         "cmp   %1, %3  \n\t"
+        "it    le      \n\t"
         "movle %1, %3  \n\t"
         "cmp   %0, %1  \n\t"
+        "it    gt      \n\t"
         "movgt %0, %1  \n\t"
         : "=&r"(m), "+r"(a)
         : "r"(b), "r"(c)