Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: mmx2 ---> mmxext in asm constructs

Conflicts:
	libavcodec/x86/h264_chromamc_10bit.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/x86/ac3dsp.asm
Simple merge

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

diff --cc libavcodec/x86/dsputil.asm
Simple merge

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

diff --cc libavcodec/x86/dsputilenc.asm
Simple merge

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

diff --cc libavcodec/x86/h264_chromamc.asm
Simple merge

diff --cc libavcodec/x86/h264_chromamc_10bit.asm
index d24308d,aec7678..b850551
--- 1/libavcodec/x86/h264_chromamc_10bit.asm
--- 2/libavcodec/x86/h264_chromamc_10bit.asm
+++ b/libavcodec/x86/h264_chromamc_10bit.asm
@@@ -251,21 -251,17 +251,21 @@@ cglobal %1_h264_chroma_mc2_10, 6,
  %define CHROMAMC_AVG  NOTHING
  INIT_XMM sse2
  CHROMA_MC8 put
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  CHROMA_MC8 put
- INIT_MMX mmx2
 +%endif
+ INIT_MMX mmxext
  CHROMA_MC4 put
  CHROMA_MC2 put
  
  %define CHROMAMC_AVG  AVG
  INIT_XMM sse2
  CHROMA_MC8 avg
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  CHROMA_MC8 avg
- INIT_MMX mmx2
 +%endif
+ INIT_MMX mmxext
  CHROMA_MC4 avg
  CHROMA_MC2 avg

diff --cc libavcodec/x86/h264_deblock.asm
index 53f9401,c124c4d..cf75621
--- 1/libavcodec/x86/h264_deblock.asm
--- 2/libavcodec/x86/h264_deblock.asm
+++ b/libavcodec/x86/h264_deblock.asm
@@@ -784,12 -780,10 +784,12 @@@ cglobal deblock_h_luma_intra_8, 2,
  
  INIT_XMM sse2
  DEBLOCK_LUMA_INTRA v
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  DEBLOCK_LUMA_INTRA v
 +%endif
  %if ARCH_X86_64 == 0
- INIT_MMX mmx2
+ INIT_MMX mmxext
  DEBLOCK_LUMA_INTRA v8
  %endif
  

diff --cc libavcodec/x86/h264_deblock_10bit.asm
Simple merge

diff --cc libavcodec/x86/h264_idct.asm
Simple merge

diff --cc libavcodec/x86/h264_idct_10bit.asm
Simple merge

diff --cc libavcodec/x86/h264_intrapred.asm
Simple merge

diff --cc libavcodec/x86/h264_intrapred_10bit.asm
Simple merge

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

diff --cc libavcodec/x86/h264_weight.asm
Simple merge

diff --cc libavcodec/x86/h264dsp_init.c
index 96fafbe,d7257e6..3640495
--- 1/libavcodec/x86/h264dsp_init.c
--- 2/libavcodec/x86/h264dsp_init.c
+++ b/libavcodec/x86/h264dsp_init.c
@@@ -128,8 -129,8 +129,8 @@@ LF_IFUNC(v, chroma_intra, depth, avx
  LF_FUNCS(uint8_t,   8)
  LF_FUNCS(uint16_t, 10)
  
 -#if ARCH_X86_32
 +#if ARCH_X86_32 && HAVE_YASM
- LF_FUNC(v8, luma, 8, mmx2)
+ LF_FUNC(v8, luma, 8, mmxext)
  static void ff_deblock_v_luma_8_mmxext(uint8_t *pix, int stride, int alpha,
                                         int beta, int8_t *tc0)
  {

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

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

diff --cc libavcodec/x86/vp3dsp.asm
Simple merge

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

diff --cc libavcodec/x86/vp8dsp.asm
Simple merge

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

diff --cc libavutil/x86/x86util.asm
Simple merge

diff --cc libswscale/x86/output.asm
Simple merge

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