diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 03:13:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 03:43:29 +0100 |
| commit | b3ab2810277decc2c0bfbaa08414a432e4774f34 (patch) | |
| tree | 631e720f6666ee52f2b4ac7d0f1ff3f179983736 /libavcodec/x86 | |
| parent | 2338af0fb48e600a24ad740b0d996ca7274e8c18 (diff) | |
| download | ffmpeg-b3ab2810277decc2c0bfbaa08414a432e4774f34.tar.gz | |
avcodec/x86/cabac: workaround llvm 4.2.1 bug
x86_64 is affected by this too
Fixes Ticket2156
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | 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 35f4ca7fdd..2c9f77e3ff 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -151,7 +151,7 @@ #if HAVE_7REGS && !(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) + && !( !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) |