From: Michael Niedermayer Date: Sat, 5 Apr 2014 17:04:56 +0000 (+0200) Subject: Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647' X-Git-Tag: n2.3~1922 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=874f27a8f7e3ca2169c28746173c0a92659beb9c Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647' * commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647': x86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes Merged-by: Michael Niedermayer --- 874f27a8f7e3ca2169c28746173c0a92659beb9c diff --cc libavcodec/x86/mpegvideo.c index b2ce68062c,db94ffabb0..9353a82933 --- a/libavcodec/x86/mpegvideo.c +++ b/libavcodec/x86/mpegvideo.c @@@ -25,9 -25,8 +25,8 @@@ #include "libavutil/x86/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/mpegvideo.h" - #include "dsputil_x86.h" -#if HAVE_INLINE_ASM +#if HAVE_MMX_INLINE static void dct_unquantize_h263_intra_mmx(MpegEncContext *s, int16_t *block, int n, int qscale)