aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-04-08 14:30:13 +0200
committerClément Bœsch <u@pkh.me>2017-04-08 14:30:13 +0200
commit5be1440c74d017b935a447b4dc979b7bb11f6aff (patch)
treefde8443c379e7d170bac930150dd09f78d0c0174
parent0768aaec1d683226e613e692080a588359c31334 (diff)
parent0a35f128f3c6e0ae9a0a2236c557602c108da269 (diff)
downloadffmpeg-5be1440c74d017b935a447b4dc979b7bb11f6aff.tar.gz
Merge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269'
* commit '0a35f128f3c6e0ae9a0a2236c557602c108da269': cabac: x86: Give optimizations header a more meaningful name Merged-by: Clément Bœsch <u@pkh.me>
-rw-r--r--libavcodec/h264_cabac.c2
-rw-r--r--libavcodec/x86/h264_cabac.c (renamed from libavcodec/x86/h264_i386.h)6
2 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index a1a16daafa..11ff3a08ef 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -43,7 +43,7 @@
#include "mpegutils.h"
#if ARCH_X86
-#include "x86/h264_i386.h"
+#include "x86/h264_cabac.c"
#endif
/* Cabac pre state table */
diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_cabac.c
index 19cd128381..2edc6d7e74 100644
--- a/libavcodec/x86/h264_i386.h
+++ b/libavcodec/x86/h264_cabac.c
@@ -22,13 +22,10 @@
/**
* @file
* H.264 / AVC / MPEG-4 part10 codec.
- * non-MMX i386-specific optimizations for H.264
+ * non-SIMD x86-specific optimizations for H.264
* @author Michael Niedermayer <michaelni@gmx.at>
*/
-#ifndef AVCODEC_X86_H264_I386_H
-#define AVCODEC_X86_H264_I386_H
-
#include <stddef.h>
#include "libavcodec/cabac.h"
@@ -209,4 +206,3 @@ static int decode_significance_8x8_x86(CABACContext *c,
#endif /* HAVE_7REGS && BROKEN_COMPILER */
#endif /* HAVE_INLINE_ASM */
-#endif /* AVCODEC_X86_H264_I386_H */