summaryrefslogtreecommitdiff
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-09 03:42:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-09 03:43:56 +0100
commit444632eae6f4f72c35f0f5f2fa1afda2859d3113 (patch)
tree0f48b01778b1d440b94aa33c3d868921be7e9d84 /libavcodec/x86
parent2138a89e71f7ad944071db8717aebb4a935c9896 (diff)
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@gmx.at>
Diffstat (limited to 'libavcodec/x86')
-rw-r--r--libavcodec/x86/cabac.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h
index 3c3652d5f0..983cf385b7 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)