• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 77aedc77
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    77aedc77
fmtconvert_init.c 5.83 KB