---
libavcodec/h264_cabac.c | 2 +-
libavcodec/x86/{h264_i386.h => h264_cabac.c} | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
rename libavcodec/x86/{h264_i386.h => h264_cabac.c} (98%)
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index ae1ef6b..b28e486 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -41,7 +41,7 @@
#include "mpegutils.h"
#if ARCH_X86
-#include "x86/h264_i386.h"
+#include "x86/h264_cabac.c"
#endif
#include <assert.h>
diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_cabac.c
similarity index 98%
rename from libavcodec/x86/h264_i386.h
rename to libavcodec/x86/h264_cabac.c
index ad57aa9..475c450 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 <[email protected]>
*/
-#ifndef AVCODEC_X86_H264_I386_H
-#define AVCODEC_X86_H264_I386_H
-
#include <stddef.h>
#include "libavcodec/cabac.h"
@@ -201,4 +198,3 @@ static int decode_significance_8x8_x86(CABACContext *c,
#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */
#endif /* HAVE_INLINE_ASM */
-#endif /* AVCODEC_X86_H264_I386_H */
--
2.1.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
