Michael Niedermayer
1eb7f39c7b
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
h264: error out on invalid bitdepth.
aacsbr: use a swap index for the Y matrix rather than copy buffers.
huffyuv: do not abort on unknown pix_fmt; instead, return an error.
lcl: return negative error codes on decode_init() errors.
rtpenc: Use MB info side data for splitting H263 packets for RFC 2190
h263enc: Add an option for outputting info about MBs as side data
avpacket: Add a function for shrinking already allocated side data
nellymoserdec: Saner and faster IMDCT windowing
Conflicts:
doc/APIchanges
libavcodec/avpacket.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-01 23:11:31 +01:00
2012-02-06 20:33:06 +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
2012-01-31 07:50:31 +01:00
2012-02-16 01:34:37 +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-25 04:00:43 +01:00
2012-02-10 01:20:07 +01:00
2011-12-31 22:33:58 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-02-16 01:34:37 +01:00
2012-03-01 03:17: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
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
2012-02-11 01:22:22 +01:00
2012-01-23 17:18:13 +01:00
2012-01-28 07:53:34 +01:00
2012-02-26 19:39:59 +01:00
2011-12-30 20:00:53 +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 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-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 22:01:05 +01:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-02-01 02:36:09 +01:00
2011-12-11 01:05:33 +01:00
2012-01-28 07:53:34 +01:00
2011-12-22 01:51:53 +01:00
2012-02-28 03:38:58 +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
2012-02-02 14:31:17 +01: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
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +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-23 04:31:55 +01:00
2012-02-23 04:31:55 +01:00
2012-02-23 04:31:55 +01:00
2012-02-01 02:36:09 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-02-23 04:31:55 +01:00
2012-02-23 04:31:55 +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
2012-02-10 15:27:49 -05: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
2012-02-24 02:57:18 +01:00
2012-03-01 03:17:11 +01:00
2012-02-26 05:11:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-04 02:34:14 +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
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-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-02-28 20:48:43 +01:00
2012-03-01 03:17:11 +01:00
2012-02-28 03:38:58 +01:00
2012-02-23 04:31:55 +01:00
2012-02-17 00:35:06 +01:00
2012-01-30 23:29:34 +01:00
2012-03-01 03:17:11 +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
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-29 00:30:35 +01:00
2012-02-14 01:53:31 +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-28 20:24:01 +01:00
2012-02-28 20:24:01 +01:00
2012-02-28 20:24:01 +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
2012-02-09 23:25:46 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-18 21:35:49 +01:00
2012-02-25 04:00:43 +01:00
2012-02-18 12:04:14 +01:00
2012-02-04 20:18:31 +01:00
2011-12-19 02:34:18 +01:00
2011-12-20 22:38:53 +01:00
2012-03-01 03:17:11 +01:00
2012-02-29 14:26:14 +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
2012-02-28 07:20:36 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-02-26 07:30:21 +01:00
2012-02-01 02:36:09 +01:00
2012-01-05 02:03:12 +01:00
2012-02-01 02:36:09 +01:00
2011-12-13 00:39:48 +01:00
2012-02-22 23:34:45 -05:00
2012-02-29 00:30:35 +01:00
2012-02-25 02:33:30 +01:00
2012-01-03 03:06:45 +01:00
2012-01-28 07:53:34 +01:00
2012-02-16 01:34:37 +01:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-02-24 02:57:18 +01: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
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
2012-02-17 00:35:06 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-03-01 16:08:32 +02:00
2012-02-24 02:57:18 +01:00
2011-12-12 01:25:37 +01:00
2012-01-29 00:34:59 +01:00
2012-03-01 23:11:31 +01:00
2012-03-01 23:11:31 +01:00
2012-02-17 00:35:06 +01:00
2012-02-28 03:38:58 +01:00
2012-01-23 01:05:20 +01: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
2012-02-23 16:00:22 +01:00
2012-02-24 02:57:18 +01:00
2011-12-13 00:39:48 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-02-28 15:01:20 +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
2012-02-16 01:34:37 +01:00
2011-12-12 01:25:37 +01: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
2012-03-01 03:17:11 +01: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-02-23 23:24:14 +01:00
2012-01-28 07:53:34 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2011-12-30 20:00:53 +01:00
2012-03-01 03:17:11 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-12-13 00:39:48 +01:00
2012-03-01 03:17:11 +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
2012-01-28 07:53:34 +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
1eb7f39c7b