• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f095391a
    Michael Niedermayer authored
    * qatar/master: (31 commits)
      cdxl demux: do not create packets with uninitialized data at EOF.
      Replace computations of remaining bits with calls to get_bits_left().
      amrnb/amrwb: Remove get_bits usage.
      cosmetics: reindent
      avformat: do not require a pixel/sample format if there is no decoder
      avformat: do not fill-in audio packet duration in compute_pkt_fields()
      lavf: Use av_get_audio_frame_duration() in get_audio_frame_size()
      dca_parser: parse the sample rate and frame durations
      libspeexdec: do not set AVCodecContext.frame_size
      libopencore-amr: do not set AVCodecContext.frame_size
      alsdec: do not set AVCodecContext.frame_size
      siff: do not set AVCodecContext.frame_size
      amr demuxer: do not set AVCodecContext.frame_size.
      aiffdec: do not set AVCodecContext.frame_size
      mov: do not set AVCodecContext.frame_size
      ape: do not set AVCodecContext.frame_size.
      rdt: remove workaround for infinite loop with aac
      avformat: do not require frame_size in avformat_find_stream_info() for CELT
      avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3
      avformat: do not require frame_size in avformat_find_stream_info() for AAC
      ...
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/Makefile
    	libavcodec/avcodec.h
    	libavcodec/h264.c
    	libavcodec/h264_ps.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavcodec/x86/dsputil_mmx.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f095391a
version.h 2.69 KB