ffmpeg/libavformat
Michael Niedermayer 57bf0d1fe5 Merge branch 'release/0.7' into oldabi
* release/0.7: (290 commits)
  nuv: Fix combination of size changes and LZO compression.
  av_lzo1x_decode: properly handle negative buffer length.
  Do not call parse_keyframes_index with NULL stream.
  update versions for 0.7 branch
  Version numbers for 0.8.6
  snow: emu edge support Fixes Ticket592
  imc: validate channel count
  imc: check for ff_fft_init() failure (cherry picked from commit 95fee70d6773fde1c34ff6422f48e5e66f37f263)
  libgsmdec: check output buffer size before decoding (cherry picked from commit b03761b1309293bbf30edef767503875277b01cf)
  configure: fix arch x86_32
  mp3enc: avoid truncating id3v1 tags by one byte
  asfdec: Check packet_replic_size earlier
  cin audio: validate the channel count
  binkaudio: add some buffer overread checks.
  atrac1: validate number of channels (cherry picked from commit bff5b2c1ca1290ea30587ff2f76171f9e3854872)
  atrac1: check output buffer size before decoding (cherry picked from commit 33684b9c12b74c0140fb91e8150263db4a48d55e)
  vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f)
  apedec: set s->currentframeblocks after validating nblocks
  apedec: use unsigned int for 'nblocks' and make sure that it's within int range
  apedec: check for data buffer realloc failure (cherry picked from commit 11ca8b2d7486e879926488404b3b79af774f0f2d)
  ...

Conflicts:
	Changelog
	Makefile
	RELEASE
	configure
	libavcodec/error_resilience.c
	libavcodec/mpegvideo.c
	libavformat/matroskaenc.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 01:03:40 +01:00
..
2011-11-09 01:03:40 +01:00
2011-07-31 19:40:08 +02:00
2011-09-26 19:26:28 +02:00
2011-05-15 03:25:57 +02:00
2011-11-09 01:03:40 +01:00
2011-08-05 13:02:20 +02:00
2011-04-17 23:43:54 +02:00
2011-04-04 02:15:12 +02:00
2011-08-05 13:02:20 +02:00
2011-06-16 06:29:01 +02:00
2011-08-05 13:02:20 +02:00
2011-11-09 01:03:40 +01:00
2011-08-01 00:58:49 +02:00
2011-07-24 23:52:42 +02:00
2011-04-09 03:17:07 +02:00
2011-06-16 06:29:01 +02:00
2011-04-09 03:17:07 +02:00
2011-05-15 19:18:02 +02:00
2011-09-26 19:26:30 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-08-05 13:02:20 +02:00
2011-08-05 13:02:20 +02:00
2011-08-05 13:02:20 +02:00
2011-08-05 13:02:20 +02:00
2011-06-16 06:29:01 +02:00
2011-04-07 03:32:26 +02:00
2011-08-05 13:02:20 +02:00
2011-04-07 03:32:26 +02:00
2011-08-05 13:02:20 +02:00
2011-04-20 04:48:23 +02:00
2011-06-16 06:29:01 +02:00
2011-06-16 06:29:01 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-08-05 13:02:20 +02:00
2011-06-16 06:29:01 +02:00
2011-11-09 01:03:40 +01:00
2011-11-09 01:03:40 +01:00
2011-09-22 04:34:43 +02:00
2011-08-05 13:02:20 +02:00
2011-08-05 13:02:20 +02:00
2011-06-02 20:06:00 +01:00
2011-08-05 13:02:20 +02:00
2011-11-09 01:03:40 +01:00
2011-09-22 04:34:43 +02:00
2011-04-04 02:15:12 +02:00
2011-08-05 13:02:20 +02:00
2011-09-07 16:57:33 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-08-05 13:02:20 +02:00
2011-08-05 13:02:20 +02:00
2011-08-05 13:02:20 +02:00
2011-08-01 00:58:49 +02:00
2011-06-16 06:29:01 +02:00
2011-11-09 01:03:40 +01:00
2011-08-05 13:02:20 +02:00
2011-11-09 01:03:40 +01:00
2011-08-05 13:02:20 +02:00
2011-05-01 21:13:18 +02:00