• 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
Name
Last commit
Last update
..
doxy Loading commit data...
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avtools-common-opts.texi Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
errno.txt Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.texi Loading commit data...
ffmpeg-mt-authorship.txt Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffprobe.xsd Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavfilter.texi Loading commit data...
metadata.texi Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
platform.texi Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...