• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e776ee8f
    Michael Niedermayer authored
    * qatar/master:
      lavr: fix handling of custom mix matrices
      fate: force pix_fmt in lagarith-rgb32 test
      fate: add tests for lagarith lossless video codec.
      ARMv6: vp8: fix stack allocation with Apple's assembler
      ARM: vp56: allow inline asm to build with clang
      fft: 3dnow: fix register name typo in DECL_IMDCT macro
      x86: dct32: port to cpuflags
      x86: build: replace mmx2 by mmxext
      Revert "wmapro: prevent division by zero when sample rate is unspecified"
      wmapro: prevent division by zero when sample rate is unspecified
      lagarith: fix color plane inversion for YUY2 output.
      lagarith: pad RGB buffer by 1 byte.
      dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/lagarith.c
    	libavfilter/x86/gradfun.c
    	libavutil/cpu.h
    	libavutil/version.h
    	libswscale/utils.c
    	libswscale/version.h
    	libswscale/x86/yuv2rgb.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e776ee8f
pngdsp-init.c 1.9 KB