• Michael Niedermayer's avatar
    Merge commit 'fa8fcab1' · add7513e
    Michael Niedermayer authored
    * commit 'fa8fcab1':
      x86: h264_chromamc_10bit: drop pointless PAVG %define
      x86: mmx2 ---> mmxext in function names
      swscale: do not forget to swap data in formats with different endianness
    
    Conflicts:
    	libavcodec/x86/dsputil_mmx.c
    	libavfilter/x86/gradfun.c
    	libswscale/input.c
    	libswscale/utils.c
    	libswscale/x86/swscale.c
    	tests/ref/lavfi/pixfmts_scale
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    add7513e
dsputilenc_mmx.c 35.7 KB