Browse Source

avcodec/x86/cabac: factorize broken llvm/clang check out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
commit
32de28053d
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      libavcodec/x86/cabac.h

+ 8
- 3
libavcodec/x86/cabac.h View File

@@ -27,6 +27,13 @@
#include "libavutil/internal.h"
#include "config.h"

#if (defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10)))\
|| ( !defined(__clang__) && defined(__llvm__) && __GNUC__==4 && __GNUC_MINOR__==2 && __GNUC_PATCHLEVEL__<=1)
# define BROKEN_COMPILER 1
#else
# define BROKEN_COMPILER 0
#endif

#if HAVE_INLINE_ASM

#ifdef BROKEN_RELOCATIONS
@@ -149,9 +156,7 @@

#endif /* BROKEN_RELOCATIONS */


#if HAVE_7REGS && !(defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10)))\
&& !( !defined(__clang__) && defined(__llvm__) && __GNUC__==4 && __GNUC_MINOR__==2 && __GNUC_PATCHLEVEL__<=1)
#if HAVE_7REGS && !BROKEN_COMPILER
#define get_cabac_inline get_cabac_inline_x86
static av_always_inline int get_cabac_inline_x86(CABACContext *c,
uint8_t *const state)


Loading…
Cancel
Save