Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:04:56 +0000 (19:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:05:00 +0000 (19:05 +0200)
* commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647':
  x86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/mpegvideoenc.c

Simple merge
Simple merge
@@@ -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)
Simple merge