• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 51bfaa21
    Michael Niedermayer authored
    * qatar/master: (22 commits)
      g722dec: check output buffer size before decoding
      g722dec: cosmetics: reindent/linewrap
      g722dec: remove the use of lowres for half-rate decoding.
      tta: check for extradata allocation failure in tta demuxer
      tta: check for allocation failure of decode_buffer
      tta: use correct frame_length calculation.
      tta: add support for decoding 24-bit sample format
      cosmetics: indentation
      tta: remove pointless braces
      tta: check output buffer size after adjusting frame length for last frame
      tta: fix reading of format in TTA header.
      tta: remove useless commented-out lines
      tta: check remaining bitstream size while reading unary value
      lavf: deprecate AVStream.stream_copy
      avconc: split choose_codec() to choose_decoder/choose_encoder.
      lavf: simplify by using FFMAX/FFMIN.
      mpegenc: add preload private option.
      cosmetics: simplify latm_decode_init
      latm: avoid unnecessary reinit of the aac decoder
      aacdec: initialize sbr context only in new channel elements
      ...
    
    Conflicts:
    	avconv.c
    	libavcodec/resample.c
    	libavcodec/tta.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    51bfaa21
avconv.c 158 KB