Merge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269'

* commit '0a35f128f3c6e0ae9a0a2236c557602c108da269':
  cabac: x86: Give optimizations header a more meaningful name

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/h264_cabac.c
index a1a16da,b28e486..11ff3a0
--- 1/libavcodec/h264_cabac.c
--- 2/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@@ -43,9 -41,11 +43,9 @@@
  #include "mpegutils.h"
  
  #if ARCH_X86
- #include "x86/h264_i386.h"
+ #include "x86/h264_cabac.c"
  #endif
  
 -#include <assert.h>
 -
  /* Cabac pre state table */
  
  static const int8_t cabac_context_init_I[1024][2] =

diff --cc libavcodec/x86/h264_cabac.c
index 19cd128,475c450..2edc6d7
--- 1/libavcodec/x86/h264_i386.h
--- 2/libavcodec/x86/h264_cabac.c
+++ b/libavcodec/x86/h264_cabac.c
@@@ -206,7 -195,6 +203,6 @@@ static int decode_significance_8x8_x86(
      );
      return coeff_count;
  }
 -#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */
 +#endif /* HAVE_7REGS && BROKEN_COMPILER */
  
  #endif /* HAVE_INLINE_ASM */
- #endif /* AVCODEC_X86_H264_I386_H */