Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'

* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
  Drop unnecessary libavutil/x86/asm.h #includes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/msmpeg4dec.c
index 35aa15c,7c22b37..2f90877
--- 1/libavcodec/msmpeg4dec.c
--- 2/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.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"

diff --cc libavcodec/x86/audiodsp_init.c
index a2ce231,8eb2e56..8f9e604
--- 1/libavcodec/x86/audiodsp_init.c
--- 2/libavcodec/x86/audiodsp_init.c
+++ b/libavcodec/x86/audiodsp_init.c
@@@ -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);

diff --cc libavcodec/x86/fmtconvert_init.c
Simple merge

diff --cc libavcodec/x86/hpeldsp_init.c
Simple merge

diff --cc libavcodec/x86/mpegvideodsp.c
index 941a8e2,b701ef8..e0498f3
--- 1/libavcodec/x86/mpegvideodsp.c
--- 2/libavcodec/x86/mpegvideodsp.c
+++ b/libavcodec/x86/mpegvideodsp.c
@@@ -19,10 -19,8 +19,9 @@@
  #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
  

diff --cc libavcodec/x86/rv34dsp_init.c
Simple merge

diff --cc libavcodec/x86/vp6dsp_init.c
Simple merge

diff --cc libavcodec/x86/vp8dsp_init.c
Simple merge

diff --cc libavfilter/x86/vf_gradfun_init.c
Simple merge

diff --cc libavfilter/x86/vf_interlace_init.c
Simple merge

diff --cc libavfilter/x86/vf_yadif_init.c
index c36a2d0,863e7df..c39bc44
--- 1/libavfilter/x86/vf_yadif_init.c
--- 2/libavfilter/x86/vf_yadif_init.c
+++ b/libavfilter/x86/vf_yadif_init.c
@@@ -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"
  

diff --cc libswscale/x86/rgb2rgb.c
Simple merge

diff --cc libswscale/x86/swscale.c
index 3b370be,ec77467..7356692
--- 1/libswscale/x86/swscale.c
--- 2/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
@@@ -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"