1. 03 Nov, 2011 2 commits
    • Carl Eugen Hoyos's avatar
      80af00b4
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 988f585f
      Michael Niedermayer authored
      * qatar/master: (44 commits)
        replacement Indeo 3 decoder
        gsm demuxer: do not allocate packet twice.
        flvenc: use first packet delay as global delay.
        ac3enc: doxygen update.
        imc: return error codes instead of 0 for error conditions.
        imc: return meaningful error codes instead of -1
        imc: do not set channel layout for stereo
        imc: validate channel count
        imc: check for ff_fft_init() failure
        imc: check output buffer size before decoding
        imc: use DSPContext.bswap16_buf() to byte-swap packet data
        rtsp: add allowed_media_types option
        libgsm: add flush function to reset the decoder state when seeking
        libgsm: simplify decoding by using a loop
        gsm: log error message when packet is too small
        libgsmdec: do not needlessly set *data_size to 0
        gsmdec: do not needlessly set *data_size to 0
        gsmdec: add flush function to reset the decoder state when seeking
        libgsmdec: check output buffer size before decoding
        gsmdec: log error message when output buffer is too small.
        ...
      
      Conflicts:
      	Changelog
      	ffplay.c
      	libavcodec/indeo3.c
      	libavcodec/mjpeg_parser.c
      	libavcodec/vp3.c
      	libavformat/cutils.c
      	libavformat/id3v2.c
      	libavutil/parseutils.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      988f585f
  2. 02 Nov, 2011 38 commits