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