Michael Niedermayer
0edf7ebcd6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264: clear trailing bits in partially parsed NAL units
vc1: Handle WVC1 interlaced stream
xl: Fix overreads
mpegts: rename payload_index to payload_size
segment: introduce segmented chain muxer
lavu: add AVERROR_BUG error value
avplay: clear pkt_temp when pkt is freed.
qcelpdec: K&R formatting cosmetics
qcelpdec: cosmetics: drop some pointless parentheses
x86: conditionally compile dnxhd encoder optimizations
Revert "h264: skip start code search if the size of the nal unit is known"
swscale: fix formatting and indentation of unscaled conversion routines.
h264: skip start code search if the size of the nal unit is known
cljr: fix buf_size sanity check
cljr: Check if width and height are positive integers
Conflicts:
libavcodec/cljr.c
libavcodec/vc1dec.c
libavformat/Makefile
libavformat/mpegtsenc.c
libavformat/segment.c
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-20 04:12:09 +01:00
..
2011-12-17 02:18:16 +01:00
2011-11-02 10:42:55 +01:00
2011-12-08 00:23:37 +01:00
2011-11-03 02:16:26 +01:00
2011-12-20 04:12:09 +01:00
2011-12-19 02:34:18 +01:00
2011-12-06 23:06:27 +01:00
2011-12-03 03:00:30 +01:00
2011-11-26 01:12:08 +01:00
2011-11-03 02:16:26 +01:00
2011-12-13 23:07:40 +01:00
2011-11-27 21:19:07 +01:00
2011-12-13 23:21:37 +01:00
2011-11-26 01:12:08 +01:00
2011-11-27 21:19:30 +01:00
2011-11-27 21:19:30 +01:00
2011-12-13 00:39:48 +01:00
2011-12-15 03:59:29 +01:00
2011-12-13 15:45:04 +01:00
2011-11-03 02:16:26 +01:00
2011-11-26 01:12:08 +01:00
2011-12-14 00:39:58 +01:00
2011-12-03 03:00:30 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-29 16:09:56 +01:00
2011-11-26 01:12:08 +01:00
2011-11-25 13:19:54 +00:00
2011-11-01 13:08:41 +01:00
2011-12-18 14:22:13 +01:00
2011-12-19 04:09:23 +01:00
2011-12-05 00:11:57 +01:00
2011-12-18 20:51:40 +01:00
2011-11-26 17:00:00 -05:00
2011-12-03 03:00:30 +01:00
2011-12-18 20:49:34 +01:00
2011-11-27 00:30:13 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:00:30 +01:00
2011-12-15 18:38:04 +01:00
2011-12-03 03:00:30 +01:00
2011-11-05 15:37:02 +01:00
2011-12-06 01:37:27 +01:00
2011-11-05 15:37:02 +01:00
2011-12-13 00:39:48 +01:00
2011-11-05 23:25:20 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:00:30 +01:00
2011-12-17 03:18:58 +01:00
2011-11-26 01:12:08 +01:00
2011-11-26 01:12:08 +01:00
2011-12-19 02:34:18 +01:00
2011-11-06 09:37:34 +01:00
2011-11-12 20:47:33 +01:00
2011-11-24 03:32:24 +01:00
2011-11-12 19:36:23 +01:00
2011-11-15 03:13:42 +01:00
2011-12-12 01:25:37 +01:00
2011-11-13 14:42:22 +01:00
2011-12-12 01:25:37 +01:00
2011-12-15 19:23:07 +01:00
2011-11-12 19:37:24 +01:00
2011-11-12 20:01:05 +01:00
2011-12-13 00:39:48 +01:00
2011-11-12 20:01:50 +01:00
2011-12-13 00:39:48 +01:00
2011-11-12 04:26:37 +01:00
2011-12-06 01:37:27 +01:00
2011-12-18 23:52:53 +01:00
2011-12-03 03:00:30 +01:00
2011-11-05 23:25:20 +01:00
2011-12-13 00:39:48 +01:00
2011-12-03 03:00:30 +01:00
2011-12-10 05:02:00 +01:00
2011-12-18 03:04:44 +01:00
2011-11-12 20:05:35 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-03 02:16:26 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-14 18:14:20 +01:00
2011-10-31 02:47:23 +01:00
2011-11-05 00:02:31 +01:00
2011-11-03 02:16:26 +01:00
2011-11-27 00:30:13 +01:00
2011-12-14 23:17:59 +01:00
2011-12-16 20:34:34 +01:00
2011-12-03 03:00:30 +01:00
2011-12-13 00:39:48 +01:00
2011-12-11 00:32:25 +01:00
2011-12-17 02:18:16 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-05 00:02:38 +01:00
2011-11-04 23:59:28 +01:00
2011-11-12 20:07:31 +01:00
2011-12-10 11:58:03 +01:00
2011-11-29 00:20:29 +01:00
2011-11-29 00:20:29 +01:00
2011-11-29 00:20:29 +01:00
2011-12-08 00:23:37 +01:00
2011-11-12 20:08:23 +01:00
2011-12-19 16:30:30 +01:00
2011-12-12 01:25:37 +01:00
2011-12-19 04:13:37 +01:00
2011-12-13 23:21:37 +01:00
2011-12-08 18:31:32 +01:00
2011-12-09 00:05:51 +01:00
2011-11-28 17:41:27 +01:00
2011-12-15 18:38:04 +01:00
2011-11-03 02:16:26 +01:00
2011-12-03 03:00:30 +01:00
2011-12-15 04:42:13 +01:00
2011-11-27 00:30:13 +01:00
2011-11-09 23:10:07 +01:00
2011-12-05 12:41:23 +02:00
2011-12-05 12:41:23 +02:00
2011-12-11 00:32:25 +01:00
2011-12-03 03:00:49 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:00:44 +01:00
2011-12-18 03:04:44 +01:00
2011-12-08 02:48:31 +01:00
2011-11-27 00:30:13 +01:00
2011-11-10 23:09:44 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:00:30 +01:00
2011-11-03 02:16:26 +01:00
2011-12-14 23:58:10 +01:00
2011-12-13 00:39:48 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-12-18 03:19:40 +01:00
2011-12-18 03:17:44 +01:00
2011-12-18 03:17:44 +01:00
2011-11-21 02:18:47 +01:00
2011-12-17 04:42:04 +01:00
2011-12-19 03:24:32 +01:00
2011-12-15 02:43:03 +01:00
2011-12-10 18:51:48 +01:00
2011-12-20 04:12:09 +01:00
2011-12-19 03:24:32 +01:00
2011-12-12 01:25:37 +01:00
2011-12-03 03:00:30 +01:00
2011-11-03 02:16:26 +01:00
2011-12-03 03:46:14 +01:00
2011-12-17 02:18:16 +01:00
2011-11-05 23:25:20 +01:00
2011-12-15 01:30:38 +01:00
2011-11-09 02:59:49 +01:00
2011-12-19 02:34:18 +01:00
2011-12-13 23:21:37 +01:00
2011-12-18 03:19:40 +01:00
2011-12-13 00:39:48 +01:00
2011-12-06 01:37:27 +01:00
2011-12-16 04:16:01 +01:00
2011-11-18 02:35:49 +01:00
2011-11-12 21:00:12 +01:00
2011-11-08 17:52:56 +01:00
2011-12-11 00:32:25 +01:00
2011-11-08 17:52:56 +01:00
2011-11-13 15:43:09 +01:00
2011-11-13 03:01:30 +01:00
2011-12-18 01:20:18 +01:00
2011-12-13 00:39:48 +01:00
2011-11-24 14:18:27 +01:00
2011-12-16 02:33:25 +01:00
2011-12-03 11:54:30 +01:00
2011-10-31 02:26:47 +01:00
2011-10-31 02:26:47 +01:00
2011-11-09 02:59:49 +01:00
2011-10-31 02:26:47 +01:00
2011-10-31 02:26:47 +01:00
2011-12-16 01:23:15 +01:00
2011-10-30 21:10:54 +01:00
2011-12-03 03:00:30 +01:00
2011-12-08 02:01:21 +01:00
2011-12-02 03:26:21 +01:00
2011-11-09 02:59:49 +01:00
2011-11-09 02:59:49 +01:00
2011-10-31 02:26:47 +01:00
2011-10-31 02:26:47 +01:00
2011-12-03 03:00:30 +01:00
2011-11-03 02:16:26 +01:00
2011-12-01 23:35:54 +01:00
2011-11-06 00:09:39 +01:00
2011-12-12 17:49:33 +01:00
2011-11-02 10:42:54 +01:00
2011-11-24 15:39:41 +01:00
2011-12-12 01:25:37 +01:00
2011-12-06 01:37:27 +01:00
2011-12-03 03:00:30 +01:00
2011-12-15 18:38:04 +01:00
2011-11-20 02:46:06 +01:00
2011-11-29 00:20:29 +01:00
2011-12-13 00:39:48 +01:00
2011-12-15 15:23:38 +01:00
2011-12-10 05:02:00 +01:00
2011-12-10 02:11:24 +01:00
2011-11-26 01:12:08 +01:00
2011-12-18 15:28:18 +01:00
2011-11-12 20:13:58 +01:00
2011-12-17 20:25:13 +01:00
2011-12-09 00:05:51 +01:00
2011-11-05 23:25:20 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:00:30 +01:00
2011-12-17 05:04:56 +01:00
2011-12-03 03:00:30 +01:00
2011-12-18 03:23:28 +01:00
2011-12-13 00:39:48 +01:00
2011-12-13 01:26:14 +01:00
2011-12-18 03:23:28 +01:00
2011-12-13 00:39:48 +01:00
2011-12-18 03:35:46 +01:00
2011-12-14 16:20:51 +01:00
2011-11-03 02:16:26 +01:00
2011-11-15 01:59:59 +01:00
2011-12-03 03:00:30 +01:00
2011-12-18 03:04:44 +01:00
2011-11-07 22:35:55 +01:00
2011-11-07 22:35:55 +01:00
2011-11-07 22:35:55 +01:00
2011-12-13 00:39:48 +01:00
2011-12-14 23:58:10 +01:00
2011-11-03 02:16:26 +01:00
2011-12-19 02:34:18 +01:00
2011-12-19 02:34:18 +01:00
2011-12-18 03:04:44 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-11-05 23:25:20 +01:00
2011-12-13 15:46:23 +01:00
2011-11-05 23:25:20 +01:00
2011-12-17 23:25:59 +01:00
2011-12-03 03:00:30 +01:00
2011-11-23 04:02:17 +01:00
2011-11-27 00:30:13 +01:00
2011-12-05 03:22:06 +01:00
2011-11-13 17:33:09 +01:00
2011-12-13 00:39:48 +01:00
2011-12-08 00:23:37 +01:00
2011-12-03 03:00:30 +01:00
2011-11-11 18:40:19 +01:00
2011-12-03 03:46:14 +01:00
2011-11-12 19:30:27 +01:00
2011-12-07 11:31:27 +01:00
2011-11-03 02:16:26 +01:00
2011-12-19 03:43:53 +01:00
2011-12-17 02:18:16 +01:00
2011-12-13 21:08:43 +01:00
2011-12-19 02:34:18 +01:00
2011-12-11 01:05:33 +01:00
2011-12-06 01:37:27 +01:00
2011-12-20 04:12:09 +01:00
2011-12-03 03:00:30 +01:00
2011-11-12 20:15:21 +01:00
2011-12-07 21:11:51 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:00:30 +01:00
2011-11-10 03:45:23 +01:00
2011-12-03 03:00:30 +01:00
2011-11-09 02:59:49 +01:00
2011-12-13 20:01:49 +01:00
2011-12-13 00:39:48 +01:00
2011-11-12 20:15:56 +01:00
2011-12-04 16:04:27 +01:00
2011-11-05 23:25:20 +01:00
2011-12-06 01:37:27 +01:00
2011-12-13 23:21:37 +01:00
2011-12-13 21:08:43 +01:00
2011-12-13 23:21:37 +01:00
2011-12-13 12:05:34 +00:00
2011-12-14 11:26:30 +00:00
2011-12-14 23:58:10 +01:00
2011-12-01 02:54:24 +01:00
2011-12-14 23:58:10 +01:00
2011-11-27 00:30:13 +01:00
2011-12-03 03:00:30 +01:00
2011-12-09 00:05:51 +01:00
2011-12-03 03:00:30 +01:00
2011-11-10 03:45:23 +01:00
2011-12-15 22:52:57 +01:00
2011-11-05 23:25:20 +01:00
2011-11-27 00:30:13 +01:00
2011-11-27 00:30:13 +01:00
2011-11-24 21:35:47 +01:00
2011-11-25 04:34:44 +01:00
2011-11-27 00:30:13 +01:00
2011-12-18 01:20:18 +01:00
2011-12-03 03:00:30 +01:00
2011-11-27 00:30:13 +01:00
2011-12-08 00:23:37 +01:00
2011-12-03 12:22:12 +01:00
2011-12-13 00:39:48 +01:00
2011-11-12 20:19:07 +01:00
2011-11-12 20:19:51 +01:00
2011-12-02 03:23:07 +01:00
2011-12-12 17:49:34 +01:00
2011-12-12 17:49:34 +01:00
2011-12-19 02:34:18 +01:00
2011-11-05 23:25:20 +01:00
2011-11-03 02:16:26 +01:00
2011-11-05 23:25:20 +01:00
2011-12-03 03:00:30 +01:00
2011-12-12 01:25:37 +01:00
2011-12-18 01:20:18 +01:00
2011-12-13 19:54:31 +01:00
2011-11-29 00:20:29 +01:00
2011-12-13 23:21:37 +01:00
2011-12-19 02:34:18 +01:00
2011-11-05 23:25:20 +01:00
2011-12-18 01:20:18 +01:00
2011-12-18 01:20:18 +01:00
2011-12-14 03:38:57 +01:00
2011-12-16 01:23:15 +01:00
2011-11-29 00:20:29 +01:00
2011-11-29 00:20:29 +01:00
2011-12-12 01:25:37 +01:00
2011-11-29 00:20:29 +01:00
2011-12-09 23:46:16 +01:00
2011-11-30 21:06:32 -08:00
2011-12-13 00:39:48 +01:00
2011-12-01 18:46:22 +01:00
2011-11-28 01:07:11 +01:00
2011-12-20 04:12:09 +01:00
2011-12-12 01:25:37 +01:00
2011-12-13 00:39:48 +01:00
2011-11-29 00:20:29 +01:00
2011-11-14 22:24:03 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-12-19 02:34:18 +01:00
2011-12-03 03:00:30 +01:00
2011-11-05 23:25:20 +01:00
2011-11-26 01:12:08 +01:00
2011-11-26 01:12:08 +01:00
2011-12-03 03:00:30 +01:00
2011-11-03 02:16:26 +01:00
2011-12-03 03:00:30 +01:00
2011-11-18 02:55:32 +01:00
2011-11-18 02:55:32 +01:00
2011-11-03 02:16:26 +01:00
2011-12-03 03:00:30 +01:00
2011-11-05 23:25:20 +01:00
2011-11-13 15:12:43 +01:00
2011-12-07 10:30:54 -08:00
2011-12-17 02:18:16 +01:00
2011-11-23 04:02:17 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:00:30 +01:00
2011-12-08 18:44:46 +01:00
2011-12-12 01:25:37 +01:00
2011-12-18 03:04:44 +01:00
2011-12-03 03:00:30 +01:00
2011-12-05 00:11:57 +01:00
2011-12-20 04:12:09 +01:00
2011-11-05 23:25:20 +01:00
2011-11-12 20:49:53 +01:00
2011-12-05 00:11:57 +01:00