d6a55ab016
* commit 'be209bdabb11c59de17220bdbf0bf9c9f7cc16f5': vf_pad: don't give up its own reference to the output buffer. libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions h264: fix deadlocks on incomplete reference frame decoding. cmdutils: avoid setting data pointers to invalid values in alloc_buffer() avidec: return 0, not packet size from read_packet(). wmapro: prevent division by zero when sample rate is unspecified vc1dec: check that coded slice positions and interlacing match. alsdec: fix number of decoded samples in first sub-block in BGMC mode. alsdec: remove dead assignments alsdec: Fix out of ltp_gain_values read. alsdec: Check that quantized parcor coeffs are within range. alsdec: Check k used for rice decoder. Conflicts: avconv.c libavcodec/h264.c libavcodec/libvorbis.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory. 2) Licensing ------------ * See the LICENSE file.