1. 18 Feb, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · bbb61a1c
      Michael Niedermayer authored
      * qatar/master: (22 commits)
        als: prevent infinite loop in zero_remaining().
        cook: prevent div-by-zero if channels is zero.
        pamenc: switch to encode2().
        svq1enc: switch to encode2().
        dvenc: switch to encode2().
        dpxenc: switch to encode2().
        pngenc: switch to encode2().
        v210enc: switch to encode2().
        xwdenc: switch to encode2().
        ttadec: use branchless unsigned-to-signed unfolding
        avcodec: add a Sun Rasterfile encoder
        sunrast: Move common defines to a new header file.
        cdxl: fix video decoding for some files
        cdxl: fix audio for some samples
        apetag: add proper support for binary tags
        ttadec: remove dead code
        swscale: make access to filter data conditional on filter type.
        swscale: update context offsets after removal of AlpMmxFilter.
        prores: initialise encoder and decoder parts only when needed
        swscale: make monowhite/black RGB-independent.
        ...
      
      Conflicts:
      	Changelog
      	libavcodec/alsdec.c
      	libavcodec/dpxenc.c
      	libavcodec/golomb.h
      	libavcodec/pamenc.c
      	libavcodec/pngenc.c
      	libavformat/img2.c
      	libswscale/output.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      bbb61a1c
  2. 17 Feb, 2012 34 commits
  3. 16 Feb, 2012 5 commits