• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6d91045d
    Michael Niedermayer authored
    * qatar/master: (29 commits)
      doc: update libavfilter documentation
      tls: Use the URLContext as logging context
      aes: Avoid illegal read and don't generate more key than we use.
      mpc7: Fix memset call in mpc7_decode_frame function
      atrac1: use correct context for av_log()
      apedec: consume the whole packet when copying to the decoder buffer.
      apedec: do not needlessly copy s->samples to nblocks.
      apedec: check output buffer size after calculating actual output size
      apedec: remove unneeded entropy decoder normalization.
      truespeech: use memmove() in truespeech_update_filters()
      vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
      vorbisdec: remove unneeded buf_size==0 check
      vorbisdec: return proper error codes instead of made-up ones
      http: Don't add a Range: bytes=0- header for POST
      sunrast: Check for invalid/corrupted bitstream
      http: Change the chunksize AVOption into chunked_post
      http: Add encoding/decoding flags to the AVOptions
      avconv: remove some codec-specific hacks
      crypto: add decoding flag to options.
      tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK
      ...
    
    Conflicts:
    	doc/libavfilter.texi
    	libavcodec/atrac1.c
    	libavcodec/sunrast.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6d91045d
avconv.c 162 KB