1. 04 Aug, 2012 13 commits
  2. 03 Aug, 2012 25 commits
  3. 02 Aug, 2012 2 commits
    • Nicolas George's avatar
      amerge/astreamsync/pan: fix license boilerplate. · 752344da
      Nicolas George authored
      The boilerplate states that the files are under LGPL,
      but refer the user to the GPL at one place.
      These files were (re)implemented specifically for FFmpeg.
      752344da
    • 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