• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9c6e23f5
    Michael Niedermayer authored
    * qatar/master:
      x86: fft: fix imdct_half() for AVX
      rtmppkt: Add missing libavcodec/bytestream.h include.
      rtmp: add functions for reading AMF values
      vc1dec: remove useless #include simple_idct.h
      dct-test: always link with aandcttab.o
      vp8: pack struct VP8ThreadData more efficiently
      x86: remove libmpeg2 mmx(ext) idct functions
      eamad: Use dsputils instead of a custom bswap16_buf
      Canopus Lossless decoder
    
    Conflicts:
    	Changelog
    	LICENSE
    	libavcodec/avcodec.h
    	libavcodec/cllc.c
    	libavcodec/eamad.c
    	libavcodec/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9c6e23f5
vc1dec.c 223 KB