• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 1d9569f9
    Michael Niedermayer authored
    * qatar/master: (23 commits)
      aacenc: Fix identification padding when the bitstream is already aligned.
      aacenc: Write correct length for long identification strings.
      aud: remove unneeded field, audio_stream_index from context
      aud: fix time stamp calculation for ADPCM IMA WS
      aud: simplify header parsing
      aud: set pts_wrap_bits to 64.
      cosmetics: indentation
      aud: support Westwood SND1 audio in AUD files.
      adpcm_ima_ws: fix stereo decoding
      avcodec: add a new codec_id for CRYO APC IMA ADPCM.
      vqa: remove unused context fields, audio_samplerate and audio_bits
      vqa: clean up audio header parsing
      vqa: set time base to frame rate as coded in the header.
      vqa: set packet duration.
      vqa: use 1/sample_rate as the audio stream time base
      vqa: set stream start_time to 0.
      lavc: postpone the removal of AVCodecContext.request_channels.
      lavf: postpone removing av_close_input_file().
      lavc: postpone removing old audio encoding and decoding API
      avplay: remove the -er option.
      ...
    
    Conflicts:
    	Changelog
    	libavcodec/version.h
    	libavdevice/v4l.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1d9569f9
utils.c 61.8 KB