[FFmpeg-cvslog] Remove leal op to fix icl inline asm.

Matt Oliver git at videolan.org
Mon Apr 7 13:36:03 CEST 2014


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Mon Apr  7 13:25:28 2014 +1000| [158a80cc0b51b652599a712c32e112ac238adce5] | committer: Michael Niedermayer

Remove leal op to fix icl inline asm.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=158a80cc0b51b652599a712c32e112ac238adce5
---

 libavcodec/x86/vp56_arith.h |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/libavcodec/x86/vp56_arith.h b/libavcodec/x86/vp56_arith.h
index e71dbf8..e560cd4 100644
--- a/libavcodec/x86/vp56_arith.h
+++ b/libavcodec/x86/vp56_arith.h
@@ -29,24 +29,21 @@
 static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
 {
     unsigned int code_word = vp56_rac_renorm(c);
-    unsigned int high = c->high;
-    unsigned int low = 1 + (((high - 1) * prob) >> 8);
+    unsigned int low = 1 + (((c->high - 1) * prob) >> 8);
     unsigned int low_shift = low << 16;
     int bit = 0;
+    c->code_word = code_word;
 
     __asm__(
         "subl  %4, %1      \n\t"
         "subl  %3, %2      \n\t"
-        "leal (%2, %3), %3 \n\t"
         "setae %b0         \n\t"
         "cmovb %4, %1      \n\t"
-        "cmovb %3, %2      \n\t"
-        : "+q"(bit), "+r"(high), "+r"(code_word), "+r"(low_shift)
-        : "r"(low)
+        "cmovb %5, %2      \n\t"
+        : "+q"(bit), "+&r"(c->high), "+&r"(c->code_word)
+        : "r"(low_shift), "r"(low), "r"(code_word)
     );
 
-    c->high      = high;
-    c->code_word = code_word;
     return bit;
 }
 #endif



More information about the ffmpeg-cvslog mailing list