• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e4de7167
    Michael Niedermayer authored
    * qatar/master:
      aac_latm: reconfigure decoder on audio specific config changes
      latmdec: fix audio specific config parsing
      Add avcodec_decode_audio4().
      avcodec: change number of plane pointers from 4 to 8 at next major bump.
      Update developers documentation with coding conventions.
      svq1dec: avoid undefined get_bits(0) call
      ARM: h264dsp_neon cosmetics
      ARM: make some NEON macros reusable
      Do not memcpy raw video frames when using null muxer
      fate: update asf seektest
      vp8: flush buffers on size changes.
      doc: improve general documentation for MacOSX
      asf: use packet dts as approximation of pts
      asf: do not call av_read_frame
      rtsp: Initialize the media_type_mask in the rtp guessing demuxer
      Cleaned up alacenc.c
    
    Conflicts:
    	doc/APIchanges
    	doc/developer.texi
    	libavcodec/8svx.c
    	libavcodec/aacdec.c
    	libavcodec/ac3dec.c
    	libavcodec/avcodec.h
    	libavcodec/nellymoserdec.c
    	libavcodec/tta.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavcodec/wmadec.c
    	libavformat/asfdec.c
    	tests/ref/seek/lavf_asf
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e4de7167
Name
Last commit
Last update
..
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avconv.texi 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...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.txt 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...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.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...
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...