Michael Niedermayer
be2dd2559f
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 ...
* qatar/release/0.8: (23 commits)
snow: Check mallocs at init
vorbis: Validate that the floor 1 X values contain no duplicates.
vorbisenc: check all allocations for failure
indeo3: validate new frame size before resetting decoder
lavfi: avfilter_merge_formats: handle case where inputs are same
rv34: error out on size changes with frame threading
rv34: Handle only complete frames in frame-mt.
rv34: use AVERROR return values in ff_rv34_decode_frame()
vlc/rl: Add ff_ prefix to the nonstatic symbols
h263: Add ff_ prefix to nonstatic symbols
alsdec: check opt_order.
golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls()
lavf: don't segfault when a NULL filename is passed to avformat_open_input()
mpegvideo: Don't use ff_mspel_motion() for vc1
imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt
eval: fix swapping of lt() and lte()
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
bmpdec: only initialize palette for pal8.
sipr: fall back to setting mode based on bit_rate.
...
Conflicts:
avconv.c
libavcodec/dnxhddec.c
libavcodec/golomb.h
libavcodec/h263.h
libavcodec/imgconvert.c
libavcodec/mpegvideo_common.h
libavcodec/mpegvideo_enc.c
libavcodec/nuv.c
libavcodec/rv34.c
libavcodec/sipr.c
libavcodec/vorbisdec.c
libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 04:25:51 +02:00
2012-06-09 20:39:12 +02: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
2012-03-16 09:01:08 +01:00
2011-12-12 01:25:37 +01:00
2012-01-26 02:23:56 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 20:21:47 +01:00
2012-01-24 22:53:59 +01:00
2012-06-09 20:40:50 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2012-01-16 03:43:32 +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
2012-05-03 00:20:54 +02:00
2012-09-12 16:48:59 +02: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
2012-03-16 09:01:08 +01:00
2011-11-28 01:07:11 +01:00
2012-05-06 00:50:25 +02: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-13 01:29:48 +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
2012-01-23 20:38:46 +01:00
2012-01-23 17:18:13 +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
2012-06-09 20:46:03 +02: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-06-04 13:40:13 +02:00
2011-08-09 19:56:25 +02:00
2012-01-24 17:01:10 +01:00
2012-01-13 01:29:48 +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
2012-01-11 08:56:24 -05: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
2012-01-13 15:57:34 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2012-04-02 00:52:23 +02: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
2012-01-24 02:41:53 +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-03-16 09:01:08 +01:00
2012-01-26 02:23:56 +01: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
2012-01-24 17:01:10 +01: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-03-16 09:01:08 +01:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2012-03-16 09:01:08 +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
2012-05-06 00:59:45 +02: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-09-19 00:54:30 +02:00
2012-01-26 02:23:56 +01:00
2012-01-26 02:23:56 +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-22 06:46:23 +01:00
2012-03-16 09:01:08 +01:00
2011-10-29 02:08:54 +02:00
2012-01-13 15:51:30 +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-03-21 13:25:59 +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
2012-03-16 09:01:08 +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
2012-03-16 09:01:08 +01:00
2011-12-18 16:23:16 +01:00
2012-01-21 23:46:36 +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-22 19:32:44 +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-03-16 09:01:08 +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
2012-01-21 23:11:27 +01: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-23 01:05:20 +01:00
2012-01-23 01:05:20 +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
2012-01-13 15:57:34 +01:00
2012-01-11 02:44:43 +01:00
2011-12-19 21:11:09 +01:00
2012-03-16 09:01:08 +01:00
2012-01-17 02:37:30 +01:00
2012-01-16 11:29:55 +01:00
2012-01-16 11:29:55 +01:00
2012-01-16 11:29:55 +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
2012-03-16 09:01:08 +01:00
2012-09-13 09:21:55 +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-14 17:14:18 +01:00
2012-01-06 02:45:12 +01:00
2012-10-16 04:25:51 +02:00
2011-12-01 02:54:24 +01:00
2011-12-30 20:00:53 +01:00
2012-03-16 09:01:08 +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
2012-01-24 14:13:47 -05:00
2012-01-24 22:53:59 +01:00
2012-01-11 01:34:30 +01:00
2011-09-08 01:55:07 +02:00
2012-01-12 20:09:16 +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
2012-05-06 00:53:02 +02:00
2012-05-03 00:20:54 +02:00
2012-01-24 22:53:59 +01:00
2011-12-30 20:00:53 +01:00
be2dd2559f