Michael Niedermayer
184fc600e1
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
mpegvideo_enc: only allocate output packet when we know there will be output
Add names for more channel layouts to the channel layout map.
sunrast: Add a sample request for RMP_RAW colormap.
avcodec: do not override pts or duration from the audio encoder
Add prores regression test.
Enable already existing rso regression test.
Add regression test for "sox" format muxer/demuxer.
Add dpx encoding regression test.
swscale: K&R formatting cosmetics for PowerPC code (part I/II)
img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
Clarify licensing information about files borrowed from libjpeg.
Mark mutable static data const where appropriate.
avplay: fix -threads option
dvbsubdec: avoid undefined signed left shift in RGBA macro
mlpdec: use av_log_ask_for_sample()
gif: K&R formatting cosmetics
png: make .long_name more descriptive
movdec: Adjust keyframe flagging in fragmented files
rv34: change most "int stride" into "ptrdiff_t stride".
Conflicts:
avprobe.c
ffplay.c
libavcodec/mlpdec.c
libavcodec/mpegvideo_enc.c
libavcodec/pngenc.c
libavcodec/x86/v210-init.c
libavfilter/vf_boxblur.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vf_settb.c
libavformat/img2.c
libavutil/audioconvert.c
tests/codec-regression.sh
tests/lavf-regression.sh
tests/ref/lavf/dpx
tests/ref/vsynth1/prores
tests/ref/vsynth2/prores
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-22 02:24:18 +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-22 02:24:18 +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-03 16:28:17 -05:00
2012-01-05 02:03:12 +01: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-01-06 02:45:12 +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-21 05:10:12 +01:00
2012-01-14 17:23:57 +01:00
2012-02-17 00:35:06 +01:00
2012-01-09 00:32:38 +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-04 01:12:34 +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-01-07 02:30:27 +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-07 13:38:23 -05: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-08 03:34:22 +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-01-08 03:34: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-01-08 03:34:22 +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-01-07 00:11:43 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-01-06 00:51:31 +01:00
2012-02-20 01:29:30 +01:00
2012-02-21 05:10:12 +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 02:24: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-16 01:34:37 +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-19 01:47:10 +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-17 22:38:30 +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-01-05 22:24:51 +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 02:24:18 +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-01-04 19:45:46 +01:00
2012-01-04 19:45:46 +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-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-02-20 17:46:18 +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-01-08 03:34:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-05 22:24:51 +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-17 22:39:23 +01:00
2012-01-04 19:45:46 +01:00
2012-01-04 19:45:46 +01:00
2012-02-04 01:12:04 +01:00
2012-02-21 05:10:12 +01:00
184fc600e1