Michael Niedermayer
3edff185ab
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (21 commits)
ipmovie: do not read audio packets before the codec is known
truemotion2: check size before GetBitContext initialisation
avio: Only do implicit network initialization for network protocols
avio: Add an URLProtocol flag for indicating that a protocol uses network
adpcm: ADPCM Electronic Arts has always two channels
matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
fate: Add missing reference file from 9b4767e4.
mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
4xm: Prevent buffer overreads.
mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
vp3: add fate test for non-zero last coefficient
vp3: fix streams with non-zero last coefficient
swscale: remove unused U/V arguments from yuv2rgb_write().
timer: K&R formatting cosmetics
lavf: cosmetics, reformat av_read_frame().
lavf: refactor av_read_frame() to make it easier to understand.
Report an error if pitch_lag is zero in AMR-NB decoder.
Revert "4xm: Prevent buffer overreads."
4xm: Prevent buffer overreads.
4xm: pass the correct remaining buffer size to decode_i2_frame().
...
Conflicts:
libavcodec/4xm.c
libavcodec/mjpegdec.c
libavcodec/truemotion2.c
libavformat/ipmovie.c
libavformat/mov_chan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-06 02:45:12 +01:00
2011-12-12 01:25:37 +01:00
2011-11-29 00:20:29 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 18:08:23 +01:00
2011-12-03 03:24:32 +01:00
2011-03-19 13:33:20 +00:00
2011-12-03 03:00:30 +01:00
2012-01-03 18:47:41 -05:00
2011-10-20 02:34:51 +02:00
2011-11-12 02:50:25 +01:00
2011-12-12 01:25:37 +01:00
2011-12-12 01:25:37 +01:00
2012-01-05 02:03:12 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 20:21:47 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-12-30 03:46:24 +01:00
2011-12-30 03:46:24 +01:00
2011-12-31 22:33:58 +01:00
2011-11-05 16:51:25 +01:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-12-24 23:21:40 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-11-08 10:35:14 +01:00
2011-03-19 13:33:20 +00:00
2011-11-11 02:50:35 +01:00
2011-03-19 13:33:20 +00:00
2011-12-13 00:39:48 +01:00
2011-11-28 01:07:11 +01:00
2011-12-24 03:41:50 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-05 02:03:12 +01:00
2011-12-01 02:54:24 +01:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-12-31 02:27:10 +01:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-12-12 01:25:37 +01:00
2011-12-30 20:00:53 +01:00
2011-05-27 23:48:22 +02:00
2011-12-01 02:54:24 +01:00
2011-12-02 00:51:11 +01:00
2011-12-30 20:00:53 +01:00
2011-11-13 13:14:39 +01:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-12-19 11:57:34 +01:00
2011-07-17 20:12:02 +02:00
2011-12-26 22:12:20 +01:00
2011-10-21 02:01:26 +02:00
2011-12-12 17:49:34 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2012-01-04 04:02:22 +01:00
2011-08-09 19:56:25 +02:00
2011-12-12 01:25:37 +01:00
2011-12-30 20:00:53 +01:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2011-12-22 01:51:53 +01:00
2011-12-11 01:05:33 +01:00
2011-11-02 10:43:39 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-12-22 01:51:53 +01:00
2012-01-04 22:15:47 +02:00
2011-12-16 01:23:15 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-12-03 03:24:32 +01:00
2011-10-13 06:00:03 +02:00
2012-01-06 02:45:12 +01:00
2011-11-30 20:34:45 +01:00
2011-12-26 11:22:29 +01:00
2011-03-19 13:33:20 +00:00
2011-12-12 01:25:37 +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
2012-01-06 02:45:12 +01:00
2011-11-11 02:50:35 +01:00
2011-11-12 02:50:25 +01:00
2011-03-19 13:33:20 +00:00
2011-12-04 16:44:20 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-12-31 17:15:31 +01:00
2011-10-24 01:01:21 +02:00
2011-11-03 20:21:01 +01:00
2011-12-24 12:44:30 +01:00
2011-12-22 01:51:53 +01:00
2011-09-24 22:39:52 +02:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-09-17 22:36:43 +02:00
2011-12-22 01:51:53 +01:00
2012-01-06 02:45:12 +01:00
2012-01-04 15:37:59 +01:00
2011-10-29 02:08:54 +02:00
2011-12-29 15:25:07 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:00:30 +01:00
2011-10-28 21:46:30 +02:00
2011-12-03 03:24:32 +01:00
2011-12-08 21:21:34 +01:00
2012-01-06 02:45:12 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-05-27 23:48:22 +02:00
2012-01-05 02:03:12 +01:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2012-01-05 21:21:57 +01:00
2011-12-12 01:25:37 +01:00
2011-12-30 20:00:53 +01:00
2011-12-02 00:51:11 +01:00
2011-11-06 11:52:57 +02:00
2011-06-09 04:47:19 +02:00
2011-12-03 03:24:32 +01:00
2011-04-04 01:29:40 +02:00
2011-12-30 20:00:53 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-04-20 04:48:23 +02:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-05 10:34:06 -08:00
2012-01-05 10:34:06 -08:00
2012-01-06 02:45:12 +01:00
2011-12-31 02:27:11 +01:00
2011-12-16 01:23:15 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2012-01-02 15:34:03 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-03-19 13:33:20 +00:00
2012-01-03 03:06:45 +01:00
2011-12-31 02:27:11 +01:00
2011-10-29 02:08:54 +02:00
2011-12-29 01:40:34 +01:00
2011-11-08 23:54:25 +01:00
2011-08-09 19:56:25 +02:00
2011-12-01 02:54:24 +01:00
2012-01-05 02:03:12 +01:00
2011-12-01 02:54:24 +01:00
2011-12-21 16:28:45 +01:00
2011-03-19 13:33:20 +00:00
2012-01-01 21:15:46 +01:00
2011-12-21 16:28:41 +01:00
2011-12-31 17:15:31 +01:00
2011-12-01 02:54:24 +01:00
2011-12-22 01:51:53 +01:00
2011-11-08 02:03:14 +01:00
2011-12-30 01:44:47 +01:00
2011-12-03 03:00:30 +01:00
2011-12-21 03:40:53 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-12-06 01:37:27 +01:00
2011-09-26 13:51:29 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-12-19 02:34:18 +01:00
2011-12-20 22:38:53 +01:00
2011-12-19 02:34:18 +01:00
2011-12-18 16:23:16 +01:00
2011-12-01 03:53:13 +01:00
2011-11-07 03:01:43 +01:00
2011-11-03 02:16:26 +01:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2012-01-01 22:27:04 +01:00
2011-09-17 22:36:43 +02:00
2012-01-05 02:03:12 +01:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-12-13 00:39:48 +01:00
2011-07-14 20:44:58 +02:00
2012-01-04 15:37:59 +01:00
2011-11-28 01:07:11 +01:00
2011-12-18 23:54:56 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-01-05 00:51:12 +01:00
2012-01-03 03:06:45 +01:00
2011-12-24 19:57:18 +01:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-03-19 13:33:20 +00:00
2011-12-12 01:25:37 +01:00
2011-07-03 03:14:10 +02:00
2012-01-06 02:45:12 +01:00
2011-10-18 01:54:40 +02:00
2011-12-12 01:25:37 +01:00
2011-04-24 03:41:22 +02:00
2011-12-13 00:39:48 +01:00
2011-11-30 17:39:32 +02:00
2011-12-02 00:51:11 +01:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-11-07 03:01:43 +01:00
2011-11-29 00:20:29 +01:00
2011-04-24 03:41:22 +02:00
2011-12-13 00:39:48 +01:00
2011-12-01 02:54:24 +01: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-30 17:39:32 +02:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-14 00:33:39 +01:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-12-12 01:25:37 +01:00
2011-06-17 05:49:58 +02:00
2011-10-21 02:01:26 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-12-02 00:51:11 +01:00
2011-10-13 06:00:03 +02:00
2012-01-06 02:45:12 +01:00
2012-01-04 22:15:42 +02:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2011-11-19 02:00:06 +01:00
2011-10-18 01:54:40 +02:00
2011-12-13 00:39:48 +01:00
2011-11-14 00:33:39 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-12-20 19:08:04 +01:00
2011-12-12 01:25:37 +01:00
2011-12-13 00:39:48 +01:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-12-25 04:49:23 +01:00
2011-12-19 18:31:28 +01:00
2011-12-24 22:06:25 +01:00
2011-12-19 21:11:09 +01:00
2011-12-16 03:25:20 +01:00
2011-12-29 01:40:34 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-19 19:11:49 +01:00
2011-12-12 01:25:37 +01:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-10-30 15:43:19 +02:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2012-01-06 02:45:12 +01:00
2011-12-16 06:02:14 +01:00
2011-12-01 02:54:24 +01:00
2012-01-05 23:56:52 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-16 16:58:20 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2011-12-01 02:54:24 +01:00
2011-12-30 20:00:53 +01:00
2011-12-29 01:40:34 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-12-13 00:39:48 +01:00
2011-12-01 02:54:24 +01:00
2011-12-14 15:11:10 +01:00
2011-12-01 02:54:24 +01:00
2011-12-16 16:58:20 +01:00
2011-12-11 18:47:19 +00:00
2011-09-08 01:55:07 +02:00
2012-01-03 03:23:58 +01:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-30 20:00:53 +01:00
3edff185ab