ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sat Apr 8 14:30:13 2017 +0200| [5be1440c74d017b935a447b4dc979b7bb11f6aff] | committer: Clément Bœsch
Merge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269' * commit '0a35f128f3c6e0ae9a0a2236c557602c108da269': cabac: x86: Give optimizations header a more meaningful name Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5be1440c74d017b935a447b4dc979b7bb11f6aff --- libavcodec/h264_cabac.c | 2 +- libavcodec/x86/{h264_i386.h => h264_cabac.c} | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index a1a16da..11ff3a0 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 similarity index 98% rename from libavcodec/x86/h264_i386.h rename to libavcodec/x86/h264_cabac.c index 19cd128..2edc6d7 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" @@ -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 */ ====================================================================== diff --cc libavcodec/h264_cabac.c index a1a16da,b28e486..11ff3a0 --- a/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 --- a/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 */ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
