Michael Niedermayer
2822361ed1
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
prores: get correct size for coded V plane if alpha is present
prores: do not set pixel format on codec init
pthread: prevent updating AVCodecContext from itself in frame_thread_free
pthread: copy coded frame dimensions in update_context_from_thread
vp8: prevent read from uninitialized memory in decode_mvs
vp8: force reallocation in update_thread_context after frame size change
vp8: fix return value if update_dimensions fails
matroskadec: fix out of bounds write
adpcmdec: calculate actual number of output samples for each decoder.
adpcmdec: check remaining buffer size before decoding next block in the ADPCM IMA WAV decoder.
adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
adpcmdec: remove unneeded buf_size==0 check.
adpcmdec: remove unneeded zeroing of *data_size
dnxhdenc: fixed signed multiplication overflow
Conflicts:
tests/ref/fate/prores-alpha
tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16 04:02:09 +02:00
2011-10-04 03:24:59 +02:00
2011-09-25 12:29:20 +02:00
2011-09-30 02:43:20 +02:00
2011-10-14 22:24:00 +02:00
2011-10-10 21:37:36 +02:00
2011-09-23 00:35:31 +02:00
2011-09-15 13:23:04 -07:00
2011-10-09 04:02:03 +02:00
2011-10-13 06:00:03 +02:00
2011-09-23 22:31:57 +02:00
2011-10-13 06:00:03 +02:00
2011-10-12 16:51:16 +02:00
2011-10-11 14:57:58 -04:00
2011-09-24 19:39:18 +02:00
2011-09-24 19:39:18 +02:00
2011-09-24 19:39:18 +02:00
2011-10-01 02:54:46 +02:00
2011-09-13 23:44:12 +02:00
2011-10-16 04:02:09 +02:00
2011-09-12 21:01:12 +02:00
2011-10-01 02:54:46 +02:00
2011-10-12 19:55:25 +02:00
2011-09-24 19:39:18 +02:00
2011-10-10 21:36:12 +02:00
2011-10-04 07:48:56 +02:00
2011-10-09 03:08:02 +02:00
2011-10-14 22:24:00 +02:00
2011-10-10 21:36:12 +02:00
2011-10-09 04:02:03 +02:00
2011-10-07 22:28:07 +02:00
2011-09-16 05:53:14 +02:00
2011-09-28 18:13:52 +02:00
2011-09-10 20:09:48 +02:00
2011-09-29 21:43:52 +02:00
2011-09-29 21:43:52 +02:00
2011-10-01 23:16:25 +02:00
2011-10-01 23:16:25 +02:00
2011-10-06 23:35:29 +02:00
2011-09-10 20:52:48 +02:00
2011-10-06 23:31:06 +02:00
2011-10-09 04:02:03 +02:00
2011-10-01 02:54:46 +02:00
2011-10-12 22:08:15 +02:00
2011-09-17 21:55:11 +02:00
2011-10-10 09:40:26 -07:00
2011-10-16 04:02:09 +02:00
2011-10-01 02:54:46 +02:00
2011-09-21 13:51:53 +02:00
2011-10-07 16:25:31 +02:00
2011-10-12 05:40:57 +02:00
2011-10-12 05:40:57 +02:00
2011-10-15 20:30:54 +02:00
2011-10-16 02:06:31 +02:00
2011-10-04 04:22:55 +02:00
2011-09-14 07:14:37 +02:00
2011-10-01 02:54:46 +02:00
2011-09-30 11:17:53 +02:00
2011-10-10 21:36:13 +02:00
2011-10-09 03:08:03 +02:00
2011-10-09 03:08:02 +02:00
2011-10-10 21:37:36 +02:00
2011-09-09 15:00:28 -07:00
2011-09-27 02:14:37 +02:00
2011-10-13 06:00:03 +02:00
2011-10-04 08:04:17 +02:00
2011-10-12 05:40:57 +02:00
2011-09-21 09:57:32 +02:00
2011-09-28 02:59:28 +02:00
2011-10-10 02:58:18 +02:00
2011-10-11 13:55:09 +02:00
2011-09-24 21:11:01 +02:00
2011-09-24 21:11:01 +02:00
2011-10-01 18:18:06 +02:00
2011-10-01 06:07:05 +02:00
2011-09-25 21:16:55 +02:00
2011-09-15 15:59:04 +02:00
2011-10-12 05:40:57 +02:00
2011-09-21 21:25:43 +02:00
2011-10-02 21:20:57 +02:00
2011-10-12 05:40:57 +02:00
2011-10-06 22:54:00 +02:00
2011-10-10 03:50:58 +02:00
2011-10-03 23:43:22 +02:00
2011-10-15 15:38:10 +02:00
2011-10-05 03:21:47 +02:00
2011-10-15 15:38:10 +02:00
2011-10-07 00:57:05 +02:00
2011-10-10 03:50:58 +02:00
2011-10-10 03:50:58 +02:00
2011-09-24 06:01:45 +02:00
2011-09-10 20:52:48 +02:00
2011-10-07 02:29:31 +02:00
2011-10-10 03:50:58 +02:00
2011-10-10 03:50:58 +02:00
2011-09-29 06:11:18 +02:00
2011-09-29 06:11:18 +02:00
2011-09-28 18:43:49 +02:00
2011-09-08 05:34:17 +02:00
2011-09-24 22:39:52 +02:00
2011-09-15 13:23:04 -07:00
2011-09-26 02:28:21 +02:00
2011-09-27 02:14:37 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-09-30 15:40:56 +02:00
2011-09-11 04:07:08 +02:00
2011-10-13 18:04:02 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-09-24 19:39:18 +02:00
2011-10-14 21:45:14 +02:00
2011-10-14 03:48:22 +02:00
2011-10-13 06:00:03 +02:00
2011-09-26 00:24:38 +02:00
2011-10-14 03:48:22 +02:00
2011-10-14 03:48:22 +02:00
2011-10-12 05:40:57 +02:00
2011-10-12 05:40:57 +02:00
2011-10-07 16:25:32 +02:00
2011-10-03 01:02:45 +02:00
2011-10-07 17:15:45 +02:00
2011-10-10 03:50:58 +02:00
2011-10-13 06:00:03 +02:00
2011-10-10 03:50:58 +02:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-09-24 22:39:52 +02:00
2011-10-13 06:00:03 +02:00
2011-10-07 03:38:50 +02:00
2011-10-12 05:40:57 +02:00
2011-09-21 21:25:43 +02:00
2011-10-04 08:04:17 +02:00
2011-10-03 01:02:45 +02:00
2011-10-14 22:24:00 +02:00
2011-10-14 03:48:22 +02:00
2011-10-04 06:39:29 +02:00
2011-10-14 21:45:14 +02:00
2011-10-16 04:02:09 +02:00
2011-10-12 19:55:25 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-16 04:02:09 +02:00
2011-10-11 03:42:43 +02:00
2011-10-09 04:02:03 +02:00
2011-10-05 04:07:59 +02:00
2011-10-13 06:00:03 +02:00
2011-10-05 04:07:59 +02:00
2011-10-07 16:25:31 +02:00
2011-10-09 03:22:57 +02:00
2011-10-11 03:42:43 +02:00
2011-10-11 03:42:43 +02:00
2011-09-24 22:39:52 +02:00
2011-10-11 03:42:43 +02:00
2011-09-24 01:03:07 +02:00
2011-10-04 11:58:53 +02:00
2011-09-24 22:39:52 +02:00
2011-09-19 22:45:34 +02:00
2011-09-17 21:55:11 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-12 15:52:22 +02:00
2011-10-12 15:52:22 +02:00
2011-09-17 21:55:11 +02:00
2011-10-13 06:00:03 +02:00
2011-10-14 03:48:22 +02:00
2011-10-14 21:34:20 +02:00
2011-10-14 22:24:00 +02:00
2011-10-12 05:40:57 +02:00
2011-10-12 05:40:57 +02:00
2011-10-12 05:40:57 +02:00
2011-10-13 06:00:03 +02:00
2011-09-28 00:52:37 +02:00
2011-10-02 21:20:57 +02:00
2011-10-07 16:25:31 +02:00
2011-10-10 21:36:13 +02:00
2011-10-12 18:20:18 -04:00
2011-09-18 00:29:32 +02:00
2011-09-18 00:29:32 +02:00
2011-10-14 03:48:22 +02:00
2011-09-15 13:23:04 -07:00
2011-09-24 22:39:52 +02:00
2011-10-09 03:22:49 +02:00
2011-10-07 03:38:50 +02:00
2011-09-07 12:16:15 +02:00
2011-09-07 22:58:39 +02:00
2011-09-11 12:54:47 +02:00
2011-10-10 14:11:02 +02:00
2011-10-14 03:48:22 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-11 03:42:43 +02:00
2011-10-13 06:00:03 +02:00
2011-10-11 03:42:43 +02:00
2011-10-14 22:24:00 +02:00
2011-10-06 23:33:09 +02:00
2011-09-10 22:10:00 +02:00
2011-10-07 00:27:03 +02:00
2011-10-07 00:37:32 +02:00
2011-10-16 04:02:09 +02:00
2011-10-07 00:27:24 +02:00
2011-10-07 00:27:03 +02:00
2011-10-09 03:08:03 +02:00
2011-10-03 01:02:45 +02:00
2011-10-07 16:25:31 +02:00
2011-09-24 22:39:52 +02:00
2011-09-24 22:39:52 +02:00
2011-10-07 16:25:30 +02:00
2011-10-10 03:50:58 +02:00
2011-09-27 02:14:37 +02:00
2011-10-08 03:39:01 +02:00
2011-10-09 03:22:57 +02:00
2011-10-10 03:50:58 +02:00
2822361ed1