Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Sep 2012 11:27:42 +0000 (13:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Sep 2012 11:27:42 +0000 (13:27 +0200)
commit77aedc77abbe21f2c28052544a0b2f227bca1c77
tree78e2b3d349105d6f73cd5f811e5374bca4bbcb94
parent4819d43d7f0e220b231699e0ac7b0dc906b3147c
parent75c37c5ace6271dc9dc996a61b799bcd2fc1b30d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Provide the right alignment for external mmx asm
  x86: Replace checks for CPU extensions and flags by convenience macros
  configure: msvc: fix/simplify setting of flags for hostcc
  x86: mlpdsp: mlp_filter_channel_x86 requires inline asm

Conflicts:
libavcodec/x86/fft_init.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/proresdsp_init.c
libavutil/x86/float_dsp_init.c
libswscale/utils.c
libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
19 files changed:
configure
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fft_init.c
libavcodec/x86/fmtconvert_init.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mlpdsp.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/pngdsp_init.c
libavcodec/x86/proresdsp_init.c
libavcodec/x86/rv40dsp_init.c
libavcodec/x86/vp3dsp_init.c
libavcodec/x86/vp56dsp_init.c
libavutil/x86/float_dsp_init.c
libswscale/utils.c
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c