1. 31 Oct, 2011 8 commits
  2. 30 Oct, 2011 29 commits
  3. 29 Oct, 2011 3 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · d17e7070
      Michael Niedermayer authored
      * qatar/master: (51 commits)
        cin audio: use sign_extend() instead of casting to int16_t
        cin audio: restructure decoding loop to avoid a separate counter variable
        cin audio: use local variable for delta value
        cin audio: remove unneeded cast from void*
        cin audio: validate the channel count
        cin audio: remove unneeded AVCodecContext pointer from CinAudioContext
        dsicin: fix several audio-related fields in the CIN demuxer
        flacdec: use av_get_bytes_per_sample() to get sample size
        dca: handle errors from dca_decode_block()
        dca: return error if the frame header is invalid
        dca: return proper error codes instead of -1
        utvideo: handle empty Huffman trees
        binkaudio: change short to int16_t
        binkaudio: only decode one block at a time.
        binkaudio: store interleaved overlap samples in BinkAudioContext.
        binkaudio: pre-calculate quantization factors
        binkaudio: add some buffer overread checks.
        atrac3: support float or int16 output using request_sample_fmt
        atrac3: add CODEC_CAP_SUBFRAMES capability
        atrac3: return appropriate error codes instead of -1
        ...
      
      Conflicts:
      	libavcodec/atrac1.c
      	libavcodec/dca.c
      	libavformat/mov.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      d17e7070
    • Michael Niedermayer's avatar
      mjpeg_parser: Rewrite to skip marker segments · 1af3571e
      Michael Niedermayer authored
      Based on code by Aaron Miller <amiller@atlasdigital.tv>
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      1af3571e
    • Michael Niedermayer's avatar
      429b3cd6