virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269'

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

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-04-08 14:30:13 +02:00
commit 5be1440c74
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_cabac.c
View File

@ -43,7 +43,7 @@
#include "mpegutils.h" #include "mpegutils.h"
#if ARCH_X86 #if ARCH_X86
#include "x86/h264_i386.h" #include "x86/h264_cabac.c"
#endif #endif
/* Cabac pre state table */ /* Cabac pre state table */

6
libavcodec/x86/h264_i386.h → libavcodec/x86/h264_cabac.c
View File

@ -22,13 +22,10 @@
/** /**
* @file * @file
* H.264 / AVC / MPEG-4 part10 codec. * 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> * @author Michael Niedermayer <michaelni@gmx.at>
*/ */
#ifndef AVCODEC_X86_H264_I386_H
#define AVCODEC_X86_H264_I386_H
#include <stddef.h> #include <stddef.h>
#include "libavcodec/cabac.h" #include "libavcodec/cabac.h"
@ -209,4 +206,3 @@ static int decode_significance_8x8_x86(CABACContext *c,
#endif /* HAVE_7REGS && BROKEN_COMPILER */ #endif /* HAVE_7REGS && BROKEN_COMPILER */
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
#endif /* AVCODEC_X86_H264_I386_H */