ffmpeg/libavformat
Michael Niedermayer d6a55ab016 Merge commit 'be209bdabb11c59de17220bdbf0bf9c9f7cc16f5' into release/0.10
* 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>
2012-10-25 17:02:46 +02:00
..
2011-12-12 20:21:47 +01:00
2012-01-16 03:43:32 +01:00
2011-11-05 16:51:25 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2012-06-09 20:46:03 +02:00
2011-08-09 19:56:25 +02:00
2011-12-30 20:00:53 +01:00
2011-11-03 20:21:01 +01:00
2011-12-29 15:25:07 +01:00
2011-12-30 20:00:53 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-08-09 19:56:25 +02:00
2011-12-20 22:38:53 +01:00
2011-12-18 16:23:16 +01:00
2012-01-09 11:02:21 +01:00
2011-12-18 23:54:56 +01:00
2012-01-16 11:29:55 +01:00
2011-12-19 19:11:49 +01:00
2012-09-13 09:21:55 +02:00
2011-12-16 06:02:14 +01:00
2012-01-07 09:59:15 -05:00
2012-01-14 17:14:18 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00