Michael Niedermayer
e99f1a8cc8
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
dxva2: don't check for DXVA_PictureParameters->wDecodedPictureIndex
img2: split muxer and demuxer into separate files
rm: prevent infinite loops for index parsing.
aac: fix infinite loop on end-of-frame with sequence of 1-bits.
mov: Add more HDV and XDCAM FourCCs.
lavf: don't set AVCodecContext.has_b_frames in compute_pkt_fields().
rmdec: when using INT4 deinterleaving, error out if sub_packet_h <= 1.
cdxl: correctly synchronize video timestamps to audio
mlpdec_parser: fix a few channel layouts.
Add channel names to channel_names[] array for channels added in b2890f5
movenc: Buffer the mdat for the initial moov fragment, too
flvdec: Ignore the index if the ignidx flag is set
flvdec: Fix indentation
movdec: Don't parse all fragments if ignidx is set
movdec: Restart parsing root-level atoms at the right spot
prores: use natural integer type for the codebook index
mov: Add support for MPEG2 HDV 720p24 (hdv4)
swscale: K&R formatting cosmetics (part I)
swscale: variable declaration and placement cosmetics
Conflicts:
configure
libavcodec/aacdec.c
libavcodec/mlp_parser.c
libavformat/flvdec.c
libavformat/img2.c
libavformat/isom.h
libavformat/mov.c
libavformat/movenc.c
libswscale/rgb2rgb.c
libswscale/rgb2rgb_template.c
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-23 04:31:55 +01:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-13 16:22:25 +01:00
2012-02-21 05:10:12 +01:00
2012-02-11 01:22:22 +01:00
2012-01-24 02:41:53 +01:00
2012-02-23 04:31:55 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-01-24 02:41:53 +01:00
2012-01-10 03:50:41 +01:00
2012-01-24 02:41:53 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-09 16:36:02 -08:00
2012-02-16 01:34:37 +01:00
2012-02-02 02:24:09 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 22:53:59 +01:00
2012-02-01 02:36:09 +01:00
2012-02-21 05:10:12 +01:00
2012-02-20 15:08:41 -05:00
2012-01-28 20:14:20 +01:00
2012-01-14 01:17:06 +01:00
2012-02-12 01:06:13 +01:00
2012-02-18 02:20:19 +01:00
2012-02-17 12:35:08 -08:00
2012-01-29 00:34:59 +01:00
2012-02-11 08:23:42 +01:00
2012-02-16 01:34:37 +01:00
2012-01-30 23:28:26 +01:00
2012-01-30 23:28:36 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-02-22 11:37:32 +01:00
2012-01-14 17:23:57 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 16:32:55 +01:00
2012-02-13 02:06:44 +01:00
2012-02-10 01:20:07 +01:00
2012-01-14 04:51:13 +01:00
2012-01-14 04:47:27 +01:00
2012-01-14 02:22:09 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-13 02:06:44 +01:00
2012-02-18 02:20:19 +01:00
2012-01-22 23:40:24 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-01-28 21:59:01 +01:00
2012-02-16 23:01:47 +01:00
2012-02-16 03:05:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-01-14 01:15:42 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-22 02:24:18 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-09 19:16:15 -08:00
2012-02-05 02:08:03 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-10 01:20:07 +01:00
2012-01-28 22:01:05 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-18 02:20:19 +01:00
2012-02-07 01:40:29 +01:00
2012-01-29 00:34:59 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-02 18:44:52 +01:00
2012-01-15 01:16:54 +01:00
2012-01-28 07:53:34 +01:00
2012-02-16 23:25:51 +01:00
2012-02-16 01:34:37 +01:00
2012-02-02 02:24:09 +01:00
2012-02-18 02:20:19 +01:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2012-01-12 01:10:32 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-01-15 01:16:54 +01:00
2012-01-29 00:34:59 +01:00
2012-02-19 15:29:10 +01:00
2012-01-26 19:54:38 +01:00
2012-02-19 03:57:54 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-01-29 00:34:59 +01:00
2012-02-14 01:22:38 +01:00
2012-02-16 01:34:37 +01:00
2012-02-09 01:27:12 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 13:54:41 +01:00
2012-01-12 13:54:41 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-13 19:51:19 +01:00
2012-01-12 16:32:55 +01:00
2012-02-15 22:06:38 +02:00
2012-02-06 19:39:24 +01:00
2012-02-14 01:22:38 +01:00
2012-02-14 01:22:38 +01:00
2012-02-15 22:06:46 +02:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-01-30 10:16:23 -08:00
2012-01-31 02:46:26 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 07:26:31 +01:00
2012-01-25 03:51:49 +01:00
2012-01-28 23:21:03 +01:00
2012-02-21 05:10:12 +01:00
2012-01-28 22:08:20 +01:00
2012-02-01 15:51:18 +01:00
2012-01-19 23:31:22 +01:00
2012-02-21 05:10:12 +01:00
2012-02-09 23:55:33 +01:00
2012-02-07 18:28:00 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-21 05:10:12 +01:00
2012-01-12 01:10:32 +01:00
2012-02-22 02:24:18 +01:00
2012-02-18 02:31:38 +01:00
2012-01-29 00:34:59 +01:00
2012-02-22 02:24:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-01-29 00:34:59 +01:00
2012-02-21 05:10:12 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-23 04:31:55 +01:00
2012-01-29 00:34:59 +01:00
2012-02-22 02:24:18 +01:00
2012-01-26 02:23:56 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-01-31 02:46:26 +01:00
2012-02-20 01:29:30 +01:00
2012-02-21 05:10:12 +01:00
2012-01-28 07:53:34 +01:00
2012-02-19 01:47:10 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-01-12 01:10:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 01:10:32 +01:00
2012-02-14 01:53:31 +01:00
2012-01-29 00:34:59 +01:00
2012-01-27 17:19:09 -08:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-19 04:15:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-01-29 00:34:59 +01:00
2012-02-07 15:48:33 +01:00
2012-02-21 05:10:12 +01:00
2012-01-30 11:25:59 +01:00
2012-01-17 02:37:30 +01:00
2012-01-22 00:46:19 +01:00
2012-01-30 05:20:58 +01:00
2012-02-22 03:37:18 +01:00
2012-01-30 05:20:58 +01:00
2012-02-10 23:18:52 +01:00
2012-02-22 02:24:18 +01:00
2012-02-19 16:26:46 +01:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2012-02-15 07:14:45 +01:00
2012-02-15 07:14:45 +01:00
2012-02-16 19:55:16 +01:00
2012-02-23 04:31:55 +01:00
2012-02-17 16:49:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 00:37:17 +01:00
2012-02-23 04:31:55 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 02:41:53 +01:00
2012-02-12 20:24:29 +01:00
2012-01-26 22:28:25 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 20:11:33 +01:00
2012-01-28 22:08:20 +01:00
2012-02-22 03:45:43 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-01-22 06:46:24 +01:00
2012-01-29 00:34:59 +01:00
2012-02-09 23:25:46 +01:00
2012-02-09 01:27:12 +01:00
2012-02-10 01:20:07 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 22:08:21 +01:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-20 01:29:30 +01:00
2012-02-14 19:03:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-15 01:52:14 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 14:58:25 -08:00
2012-02-20 14:58:25 -08:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 14:56:18 +00:00
2012-01-28 14:56:18 +00:00
2012-01-29 00:34:59 +01:00
2012-02-21 05:10:12 +01:00
2012-02-17 00:35:06 +01:00
2012-02-01 04:43:06 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 06:25:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-02-17 14:28:56 -05:00
2012-02-19 15:54:27 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 01:36:42 +01:00
2012-02-21 05:10:12 +01:00
2012-01-22 04:49:46 +01:00
2012-01-11 11:15:05 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 14:31:17 +01:00
2012-02-02 14:31:17 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-22 11:37:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-06 08:00:31 +01:00
2012-02-18 02:20:19 +01:00
2012-01-28 22:08:21 +01:00
2012-02-06 00:29:32 +01:00
2012-02-06 00:29:32 +01:00
2012-01-12 18:18:23 +01:00
2012-02-21 05:10:12 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-22 11:37:32 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-07 01:40:29 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-12 01:06:13 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-19 22:08:21 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-17 00:35:06 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-02-17 20:46:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-22 03:45:43 +01:00
2012-02-04 01:12:04 +01:00
2012-02-21 05:10:12 +01:00
e99f1a8cc8