[FFmpeg-cvslog] cabac: Disable get_cabac_inline_x86() for clang 2.9 on x86_32
Michael Niedermayer
git at videolan.org
Mon Jan 9 03:46:14 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 9 03:42:46 2012 +0100| [444632eae6f4f72c35f0f5f2fa1afda2859d3113] | committer: Michael Niedermayer
cabac: Disable get_cabac_inline_x86() for clang 2.9 on x86_32
This should finally fix the compilation issue on darwin
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=444632eae6f4f72c35f0f5f2fa1afda2859d3113
---
libavcodec/x86/cabac.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h
index 3c3652d..983cf38 100644
--- a/libavcodec/x86/cabac.h
+++ b/libavcodec/x86/cabac.h
@@ -81,7 +81,7 @@
"add "tmp" , "low" \n\t"\
"1: \n\t"
-#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS)
+#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && !(defined(__i386) && __clang_major__==2 && __clang_minor__==9)
#define get_cabac_inline get_cabac_inline_x86
static av_always_inline int get_cabac_inline_x86(CABACContext *c,
uint8_t *const state)
More information about the ffmpeg-cvslog
mailing list