Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:16:04 +0000 (14:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:16:18 +0000 (14:16 +0100)
commit28c0678eb764b8d10faf1a988d2f0e2dc79c96a5
tree5b1c2da26f0d95c5acd7d042dc1cf8666f22e316
parent4b874fc4fc2739db7a907ce430ac862e625b7387
parentbe923ed659016350592acb9b3346f706f8170ac5
Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

* commit 'be923ed659016350592acb9b3346f706f8170ac5':
  x86: fmtconvert: port to cpuflags
  x86: MMX2 ---> MMXEXT in macro names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/ac3dsp.asm
libavcodec/x86/cavsdsp.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_qpel.c
libavcodec/x86/vc1dsp.asm
libavutil/x86/x86util.asm
libswscale/x86/swscale_template.c