Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'

* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
  x86: cabac: Use correct #includes to make header compile standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/x86/cabac.h
index 558d287,d1701bf..3a82c1e
--- 1/libavcodec/x86/cabac.h
--- 2/libavcodec/x86/cabac.h
+++ b/libavcodec/x86/cabac.h
@@@ -23,31 -23,12 +23,31 @@@
  
  #include "libavcodec/cabac.h"
  #include "libavutil/attributes.h"
+ #include "libavutil/macros.h"
  #include "libavutil/x86/asm.h"
- #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
  
 +#ifndef UNCHECKED_BITSTREAM_READER
 +#define UNCHECKED_BITSTREAM_READER !CONFIG_SAFE_BITSTREAM_READER
 +#endif
 +
 +#if UNCHECKED_BITSTREAM_READER
 +#define END_CHECK(end) ""
 +#else
 +#define END_CHECK(end) \
 +        "cmp    "end"       , %%"REG_c"                                 \n\t"\
 +        "jge    1f                                                      \n\t"
 +#endif
 +
  #ifdef BROKEN_RELOCATIONS
  #define TABLES_ARG , "r"(tables)