diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-09 16:02:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-09 16:04:26 +0100 |
| commit | f247f4cf47f4bf6ceb647459f5c78dbf29a59178 (patch) | |
| tree | efd8881d088cd5bc4f60136dc206f3855afc75d3 | |
| parent | 3b1355bb93ad55f219e20feb31d418ef782cfb83 (diff) | |
| download | ffmpeg-f247f4cf47f4bf6ceb647459f5c78dbf29a59178.tar.gz | |
cabac: 3rd try at working around a compiler bug in clang.
Switch to a broader detection of versions.
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 983cf385b7..17e699a519 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -81,7 +81,8 @@ "add "tmp" , "low" \n\t"\ "1: \n\t" -#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && !(defined(__i386) && __clang_major__==2 && __clang_minor__==9) + +#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && !(defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10))) #define get_cabac_inline get_cabac_inline_x86 static av_always_inline int get_cabac_inline_x86(CABACContext *c, uint8_t *const state) |