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-17 20:12:02 +02:00
2011-07-31 19:40:08 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-09-26 19:26:28 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-05-15 03:25:57 +02:00
2011-07-17 20:12:02 +02:00
2011-11-09 01:03:40 +01:00
2011-07-17 20:12:02 +02:00
2011-09-26 19:26:32 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-08-05 13:02:20 +02:00
2011-05-15 19:18:02 +02:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:43:54 +02:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-11-09 01:03:40 +01:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-21 13:04:48 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-08-05 13:02:20 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-09 01:03:40 +01:00
2011-11-09 01:03:40 +01:00
2011-05-22 04:53:19 +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-09-22 04:34:43 +02:00
2011-09-21 17:57:56 +02:00
2011-03-19 13:33:20 +00:00
2011-11-09 01:03:40 +01:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-07-24 23:52:42 +02:00
2011-08-01 00:58:49 +02:00
2011-05-27 23:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-04-09 03:17:07 +02:00
2011-07-17 20:12:02 +02:00
2011-06-16 06:29:01 +02:00
2011-05-01 00:26:05 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-05-02 18:38:01 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-09 03:17:07 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-06-09 04:47:19 +02:00
2011-05-15 19:18:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-15 17:51:09 +02:00
2011-11-08 19:03:54 +01:00
2011-09-26 19:26:30 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-21 03:37:05 +02:00
2011-09-26 19:26:28 +02:00
2011-03-19 13:33:20 +00:00
2011-11-09 01:03:40 +01:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-09-22 01:48:45 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-08-05 13:02:20 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-08-05 13:02:20 +02:00
2011-07-17 20:12:02 +02:00
2011-08-05 13:02:20 +02:00
2011-08-05 13:02:20 +02:00
2011-09-21 20:56:53 +02:00
2011-06-16 06:29:01 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-04-07 03:32:26 +02:00
2011-01-30 03:40:58 +01:00
2011-07-17 20:12:02 +02:00
2011-08-05 13:02:20 +02:00
2011-07-17 20:12:02 +02:00
2011-04-07 03:32:26 +02:00
2011-05-27 23:48:22 +02:00
2011-08-05 13:02:20 +02:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-11-09 01:03:40 +01:00
2011-10-12 11:30:16 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-04-27 00:03:39 +02:00
2011-07-08 09:40:30 +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-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +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-06-11 03:51:36 +02:00
2011-07-11 04:23:25 +02:00
2011-09-22 04:34:43 +02:00
2011-11-09 01:03:40 +01:00
2011-11-09 01:03:40 +01:00
2011-07-17 20:12:02 +02:00
2011-09-22 04:34:43 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-11-09 01:03:40 +01:00
2011-03-19 13:33:20 +00:00
2011-11-09 01:03:40 +01:00
2011-05-27 23:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-21 17:57:56 +02:00
2011-03-19 13:33:20 +00:00
2011-11-09 01:03:40 +01:00
2011-09-26 19:26:28 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-06-05 03:00:31 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-08-05 13:02:20 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-26 19:26:33 +02:00
2011-06-09 04:47:19 +02:00
2011-08-05 13:02:20 +02:00
2011-05-30 00:24:01 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-02 20:06:00 +01:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:59:00 +02:00
2011-02-06 16:08:59 -05:00
2011-06-08 07:43:45 +02:00
2011-07-17 20:12:02 +02:00
2011-08-05 13:02:20 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-05-26 03:28:22 +02:00
2011-03-19 13:33:20 +00:00
2011-04-06 19:30:42 +02:00
2011-11-09 01:03:40 +01:00
2011-07-17 20:12:02 +02:00
2011-07-15 17:51:09 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-05 03:00:31 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-06-18 05:10:38 +02:00
2011-07-14 20:44:58 +02:00
2011-11-09 01:03:40 +01:00
2011-04-15 04:50:06 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-22 04:34:43 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-26 00:14:04 +02:00
2011-08-05 13:02:20 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-09-07 16:57:33 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-06-03 05:19:30 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-04-24 03:41:22 +02:00
2011-11-09 01:03:40 +01:00
2011-04-24 03:41:22 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-18 05:10:38 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-06-11 03:51:36 +02:00
2011-07-25 17:08:48 +02:00
2011-08-05 13:02:20 +02:00
2011-07-26 00:14:04 +02:00
2011-03-19 13:33:20 +00:00
2011-07-19 18:46:04 +02:00
2011-07-17 20:12:02 +02:00
2011-08-05 13:02:20 +02:00
2011-08-05 13:02:20 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-06-11 03:51:36 +02:00
2011-07-14 17:55:15 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-09-22 04:34:43 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-26 19:26:32 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-16 06:29:01 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-12 03:48:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-11-09 01:03:40 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-08-05 13:02:20 +02:00
2011-07-14 20:44:58 +02:00
2011-11-09 01:03:40 +01:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-05 13:02:20 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-11-09 01:03:40 +01:00
2011-07-03 18:30:02 +02:00
2011-05-01 21:13:18 +02:00
2011-07-15 16:57:35 +02:00
2011-07-26 00:14:04 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00