diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-11 18:09:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-11 22:30:21 +0100 |
| commit | 5387f9917f1e5a053824f9ba68545b74a2fc225b (patch) | |
| tree | f93c6da61e97f2fa2d0c888eaa69eee416c09447 | |
| parent | bc11580007b454eac090871e30ce04be7d966eb4 (diff) | |
| download | ffmpeg-5387f9917f1e5a053824f9ba68545b74a2fc225b.tar.gz | |
cabac: Try to disable problematic ASM for gcc-llvm 4.2.1
This should fix compilation with gcc-llvm (see darwin fate box)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/cabac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h index 17e699a519..2bb0be6374 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -82,7 +82,8 @@ "1: \n\t" -#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && !(defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10))) +#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && !(defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10)))\ + && !(defined(__i386) && !defined(__clang__) && defined(__llvm__) && __GNUC__==4 && __GNUC_MINOR__==2 && __GNUC_PATCHLEVEL__<=1) #define get_cabac_inline get_cabac_inline_x86 static av_always_inline int get_cabac_inline_x86(CABACContext *c, uint8_t *const state) |