summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-05 21:26:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-05 21:33:44 +0100
commit146b476ba0c99a45caae8559a2e905cbbb79a35b (patch)
tree6cae9335386eb8c3af5f22c49b1c4429b094b308 /libavcodec
parent12b97dd375736c332989c50ea68af9d834b2621f (diff)
parent3741aa37c2a0d0717faff74a5c4cc357d16f6d1d (diff)
Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'
* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d': x86: cabac: Use correct #includes to make header compile standalone Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/cabac.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h
index 558d287032..3a82c1e4a4 100644
--- a/libavcodec/x86/cabac.h
+++ b/libavcodec/x86/cabac.h
@@ -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)))\