Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:53:00 +0000 (15:53 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:53:00 +0000 (15:53 +0200)
* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
  Drop unnecessary libavutil/x86/asm.h #includes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
13 files changed:
1  2 
libavcodec/msmpeg4dec.c
libavcodec/x86/audiodsp_init.c
libavcodec/x86/fmtconvert_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/mpegvideodsp.c
libavcodec/x86/rv34dsp_init.c
libavcodec/x86/vp6dsp_init.c
libavcodec/x86/vp8dsp_init.c
libavfilter/x86/vf_gradfun_init.c
libavfilter/x86/vf_interlace_init.c
libavfilter/x86/vf_yadif_init.c
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c

@@@ -27,8 -27,6 +27,7 @@@
  #include "mpegutils.h"
  #include "mpegvideo.h"
  #include "msmpeg4.h"
- #include "libavutil/x86/asm.h"
 +#include "libavutil/imgutils.h"
  #include "h263.h"
  #include "mpeg4video.h"
  #include "msmpeg4data.h"
@@@ -21,9 -21,9 +21,8 @@@
  #include "config.h"
  #include "libavutil/attributes.h"
  #include "libavutil/cpu.h"
- #include "libavutil/x86/asm.h"
  #include "libavutil/x86/cpu.h"
  #include "libavcodec/audiodsp.h"
 -#include "audiodsp.h"
  
  int32_t ff_scalarproduct_int16_mmxext(const int16_t *v1, const int16_t *v2,
                                        int order);
Simple merge
Simple merge
  #include "config.h"
  #include "libavutil/attributes.h"
  #include "libavutil/cpu.h"
- #include "libavutil/x86/asm.h"
  #include "libavutil/x86/cpu.h"
  #include "libavcodec/mpegvideodsp.h"
 +#include "libavcodec/videodsp.h"
  
  #if HAVE_INLINE_ASM
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -20,8 -20,8 +20,7 @@@
  
  #include "libavutil/attributes.h"
  #include "libavutil/cpu.h"
 -#include "libavutil/internal.h"
  #include "libavutil/mem.h"
- #include "libavutil/x86/asm.h"
  #include "libavutil/x86/cpu.h"
  #include "libavfilter/yadif.h"
  
Simple merge
@@@ -23,9 -23,7 +23,8 @@@
  #include "libswscale/swscale.h"
  #include "libswscale/swscale_internal.h"
  #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/intreadwrite.h"
- #include "libavutil/x86/asm.h"
  #include "libavutil/x86/cpu.h"
  #include "libavutil/cpu.h"
  #include "libavutil/pixdesc.h"