Michael Niedermayer
0e7fc3cafe
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (22 commits)
rv34: frame-level multi-threading
mpegvideo: claim ownership of referenced pictures
aacsbr: prevent out of bounds memcpy().
ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
sierravmd: fix audio pts
bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
bmpenc: support for PIX_FMT_RGB444
swscale: fix crash in fast_bilinear code when compiled with -mred-zone.
swscale: specify register type.
rv34: use get_bits_left()
avconv: reinitialize the filtergraph on resolution change.
vsrc_buffer: error on changing frame parameters.
avconv: fix -copyinkf.
fate: Update file checksums after the mov muxer change in a78dbada55d6
movenc: Don't store a nonzero creation time if nothing was set by the caller
bmpdec: support for rgb444 with bitfields compression
rgb2rgb: allow conversion for <15 bpp
doc: fix stray reference to FFmpeg
v4l2: use C99 struct initializer
v4l2: poll the file descriptor
...
Conflicts:
avconv.c
libavcodec/aacsbr.c
libavcodec/bethsoftvideo.c
libavcodec/kmvc.c
libavdevice/v4l2.c
libavfilter/vsrc_buffer.c
libswscale/swscale_unscaled.c
libswscale/x86/input.asm
tests/ref/acodec/alac
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov
tests/ref/vsynth1/dnxhd_1080i
tests/ref/vsynth1/mpeg4
tests/ref/vsynth1/qtrle
tests/ref/vsynth1/svq1
tests/ref/vsynth2/dnxhd_1080i
tests/ref/vsynth2/mpeg4
tests/ref/vsynth2/qtrle
tests/ref/vsynth2/svq1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-11 02:44:43 +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-03-19 13:33:20 +00:00
2011-12-03 03:00:30 +01:00
2012-01-03 18:47:41 -05: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
2012-01-05 02:03:12 +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-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-12-30 03:46:24 +01:00
2011-12-30 03:46:24 +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
2011-12-24 23:21:40 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +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
2011-12-13 00:39:48 +01:00
2011-11-28 01:07:11 +01:00
2011-12-24 03:41:50 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-08 03:34:22 +01:00
2011-12-01 02:54:24 +01:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00: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-31 02:27:10 +01:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-12-12 01:25:37 +01:00
2011-12-30 20:00:53 +01:00
2011-05-27 23:48:22 +02:00
2011-12-01 02:54:24 +01: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
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-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-12-19 11:57:34 +01:00
2011-07-17 20:12:02 +02:00
2011-12-26 22:12:20 +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
2012-01-08 03:34:22 +01:00
2011-08-09 19:56:25 +02:00
2011-12-12 01:25:37 +01:00
2011-12-30 20:00:53 +01:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2011-12-22 01:51:53 +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
2011-12-01 02:54:24 +01:00
2011-12-22 01:51:53 +01:00
2012-01-04 22:15:47 +02:00
2011-12-16 01:23:15 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-12-03 03:24:32 +01:00
2011-10-13 06:00:03 +02:00
2012-01-06 02:45:12 +01:00
2011-11-30 20:34:45 +01:00
2011-12-26 11:22:29 +01:00
2011-03-19 13:33:20 +00:00
2011-12-12 01:25:37 +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-01-06 02:45:12 +01:00
2011-11-11 02:50:35 +01:00
2011-11-12 02:50:25 +01:00
2011-03-19 13:33:20 +00:00
2011-12-04 16:44:20 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00: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-07 13:14:34 +01:00
2011-12-22 01:51:53 +01:00
2011-09-24 22:39:52 +02:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-09-17 22:36:43 +02:00
2011-12-22 01:51:53 +01:00
2012-01-11 02:44:43 +01:00
2012-01-04 15:37:59 +01:00
2011-10-29 02:08:54 +02:00
2011-12-29 15:25:07 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00: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
2012-01-06 02:45:12 +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-05-27 23:48:22 +02:00
2012-01-08 03:34:22 +01:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2012-01-05 21:21:57 +01:00
2011-12-12 01:25:37 +01:00
2011-12-30 20:00:53 +01:00
2011-12-02 00:51:11 +01:00
2011-11-06 11:52:57 +02:00
2011-06-09 04:47:19 +02:00
2011-12-03 03:24:32 +01:00
2011-04-04 01:29:40 +02:00
2011-12-30 20:00:53 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +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-01-06 02:45:12 +01:00
2012-01-11 02:44:43 +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
2012-01-02 15:34:03 +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-03-19 13:33:20 +00:00
2012-01-03 03:06:45 +01:00
2011-12-31 02:27:11 +01:00
2011-10-29 02:08:54 +02:00
2011-12-29 01:40:34 +01:00
2011-11-08 23:54:25 +01:00
2011-08-09 19:56:25 +02:00
2011-12-01 02:54:24 +01:00
2012-01-08 03:34:22 +01:00
2011-12-01 02:54:24 +01:00
2011-12-21 16:28:45 +01:00
2011-03-19 13:33:20 +00:00
2012-01-01 21:15:46 +01:00
2011-12-21 16:28:41 +01:00
2011-12-31 17:15:31 +01:00
2011-12-01 02:54:24 +01:00
2011-12-22 01:51:53 +01:00
2011-11-08 02:03:14 +01:00
2011-12-30 01:44:47 +01:00
2011-12-03 03:00:30 +01:00
2011-12-21 03:40:53 +01:00
2011-03-19 13:33:20 +00: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-09-26 13:51:29 +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-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-20 22:38:53 +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-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +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-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2012-01-09 11:02:21 +01:00
2011-09-17 22:36:43 +02:00
2012-01-05 02:03:12 +01:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-12-13 00:39:48 +01:00
2011-07-14 20:44:58 +02:00
2012-01-04 15:37:59 +01:00
2011-11-28 01:07:11 +01:00
2011-12-18 23:54:56 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-01-08 03:34:22 +01:00
2012-01-03 03:06:45 +01:00
2011-12-24 19:57:18 +01:00
2011-03-19 13:33: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-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
2011-12-12 01:25:37 +01:00
2011-04-24 03:41:22 +02: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-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-11-07 03:01:43 +01:00
2011-11-29 00:20:29 +01:00
2011-04-24 03:41:22 +02: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
2011-11-30 17:39:32 +02:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-14 00:33:39 +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
2011-10-21 02:01:26 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-12-02 00:51:11 +01:00
2011-10-13 06:00:03 +02:00
2012-01-06 02:45:12 +01:00
2012-01-04 22:15:42 +02:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00: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-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-12-20 19:08:04 +01:00
2011-12-12 01:25:37 +01:00
2011-12-13 00:39:48 +01:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-12-25 04:49:23 +01:00
2011-12-19 18:31:28 +01:00
2012-01-11 02:44:43 +01:00
2011-12-19 21:11:09 +01:00
2011-12-16 03:25:20 +01:00
2011-12-29 01:40:34 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-19 19:11:49 +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
2011-10-21 02:01:26 +02:00
2012-01-05 16:27:07 -08:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2012-01-06 02:45:12 +01:00
2011-12-16 06:02:14 +01:00
2011-12-01 02:54:24 +01:00
2012-01-05 23:56:52 +02:00
2011-12-01 02:54:24 +01:00
2012-01-07 09:59:15 -05:00
2011-12-01 02:54:24 +01:00
2011-12-16 16:58:20 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-09 01:12:48 +01:00
2011-12-01 02:54:24 +01:00
2011-12-30 20:00:53 +01:00
2011-12-29 01:40:34 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02: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-08 03:34:22 +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-09-08 01:55:07 +02:00
2012-01-03 03:23:58 +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-30 20:00:53 +01:00
0e7fc3cafe