Merge commit '0a35f128'

* commit '0a35f128':
  cabac: x86: Give optimizations header a more meaningful name
Merged-by: Clément Bœsch <u@pkh.me>

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 */

libavcodec/x86/h264_i386.h → 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 */