ffmpeg | branch: master | Diego Biurrun <[email protected]> | Wed Mar 9 10:27:12 2016 +0100| [0a35f128f3c6e0ae9a0a2236c557602c108da269] | committer: Diego Biurrun
cabac: x86: Give optimizations header a more meaningful name > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a35f128f3c6e0ae9a0a2236c557602c108da269 --- 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 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 */ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
