[FFmpeg-cvslog] avcodec/x86/cabac: Disable get_cabac_bypass_x86() on broken llvm/clang

Michael Niedermayer git at videolan.org
Sat Jul 6 16:33:24 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul  6 16:07:09 2013 +0200| [66537c7efd4ec69056f116e6c10480bb1655b680] | committer: Michael Niedermayer

avcodec/x86/cabac: Disable get_cabac_bypass_x86() on broken llvm/clang

This should fix fate on these platforms

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

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

 libavcodec/x86/cabac.h |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h
index 1c24dc3..ee5885f 100644
--- a/libavcodec/x86/cabac.h
+++ b/libavcodec/x86/cabac.h
@@ -230,6 +230,7 @@ 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)
 {
@@ -269,6 +270,7 @@ static av_always_inline int get_cabac_bypass_x86(CABACContext *c)
     );
     return res;
 }
+#endif /* !BROKEN_COMPILER */
 
 #endif /* HAVE_INLINE_ASM */
 #endif /* AVCODEC_X86_CABAC_H */



More information about the ffmpeg-cvslog mailing list