[FFmpeg-cvslog] avcodec/x86/cabac: include get_cabac_bypass_sign_x86() under #if !BROKEN_COMPILER

Michael Niedermayer git at videolan.org
Sat Oct 26 15:16:26 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 26 14:59:05 2013 +0200| [41efb8d9a75fc302a5f204e8ef22f103b2181fd8] | committer: Michael Niedermayer

avcodec/x86/cabac: include get_cabac_bypass_sign_x86() under #if !BROKEN_COMPILER

this might fix Ticket2999 as well as some fate clients
untested as the original patch submitter no longer has the environment to test
this should be reverted if it does not fix the issues

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

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

 libavcodec/x86/cabac.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h
index 89011e8..7d431e5 100644
--- a/libavcodec/x86/cabac.h
+++ b/libavcodec/x86/cabac.h
@@ -191,6 +191,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c,
 }
 #endif /* HAVE_7REGS */
 
+#if !BROKEN_COMPILER
 #define get_cabac_bypass_sign get_cabac_bypass_sign_x86
 static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val)
 {
@@ -230,7 +231,6 @@ static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val)
     return val;
 }
 
-#if !BROKEN_COMPILER
 #define get_cabac_bypass get_cabac_bypass_x86
 static av_always_inline int get_cabac_bypass_x86(CABACContext *c)
 {



More information about the ffmpeg-cvslog mailing list