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