Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 20:26:11 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 20:33:44 +0000 (21:33 +0100)
* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
  x86: cabac: Use correct #includes to make header compile standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/cabac.h

index 558d287..3a82c1e 100644 (file)
@@ -23,8 +23,8 @@
 
 #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)))\