Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Nov 2012 11:34:30 +0000 (12:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Nov 2012 11:34:30 +0000 (12:34 +0100)
commita1b5c9634e87160251fd41635beb01da157cf00c
treea62b214125e71d0f6a0a7ce910100a3641cc010e
parentb0c543b1deba77647911be159b013760b5d05db3
parent26301caaa1aec5d71b564bff452147d6183370bf
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>
26 files changed:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_10bit.asm
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264_weight.asm
libavcodec/x86/h264dsp_init.c
libavcodec/x86/pngdsp_init.c
libavcodec/x86/rv40dsp_init.c
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp3dsp_init.c
libavcodec/x86/vp8dsp.asm
libavcodec/x86/vp8dsp_init.c
libavutil/x86/x86util.asm
libswscale/x86/output.asm
libswscale/x86/swscale.c