Michael Niedermayer
f2b20b7a8b
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
pixdesc: mark pseudopaletted formats with a special flag.
avconv: switch to avcodec_encode_video2().
libx264: implement encode2().
libx264: split extradata writing out of encode_nals().
lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket
cmdutils: update copyright year to 2012.
swscale: sign-extend integer function argument to qword on x86-64.
x86inc: support yasm -f win64 flag also.
h264: manually save/restore XMM registers for functions using INIT_MMX.
x86inc: allow manual use of WIN64_SPILL_XMM.
aacdec: Use correct speaker order for 7.1.
aacdec: Remove incorrect comment.
aacdec: Simplify output configuration.
Remove Sun medialib glue code.
dsputil: set STRIDE_ALIGN to 16 for x86 also.
pngdsp: swap argument inversion.
Conflicts:
cmdutils.c
configure
doc/APIchanges
ffmpeg.c
libavcodec/aacdec.c
libavcodec/dsputil.h
libavcodec/libx264.c
libavcodec/mlib/dsputil_mlib.c
libavcodec/utils.c
libavfilter/vf_scale.c
libavutil/avutil.h
libswscale/mlib/yuv2rgb_mlib.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-09 01:27:12 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-02-09 01:27:12 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-13 16:22:25 +01:00
2012-01-10 03:50:41 +01:00
2012-01-24 02:41:53 +01:00
2012-02-09 01:27:12 +01:00
2012-02-09 01:27:12 +01:00
2012-02-01 04:43:06 +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
2011-12-13 15:45:04 +01:00
2012-01-21 05:29:47 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 02:24:09 +01:00
2012-01-28 20:13:38 +01:00
2012-01-29 00:34:59 +01:00
2011-12-18 14:22:13 +01:00
2012-01-24 22:53:59 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-03 16:28:17 -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-07 01:40:29 +01:00
2012-02-05 20:43:33 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-06 02:45:12 +01:00
2011-12-13 00:39:48 +01:00
2012-02-08 05:53:35 +01:00
2012-01-30 23:28:26 +01:00
2012-01-30 23:28:36 +01:00
2012-02-02 02:24:09 +01:00
2011-12-31 01:16:45 +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-29 00:34:59 +01:00
2012-02-09 01:27:12 +01:00
2012-01-14 17:23:57 +01:00
2011-12-26 04:10:47 +01:00
2012-02-03 03:51:32 +01:00
2012-01-09 00:32:38 +01:00
2012-01-02 03:10:30 +01:00
2011-12-23 03:25:51 +01:00
2011-12-23 03:25:51 +01:00
2012-01-03 03:25:22 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2012-01-03 03:06:45 +01:00
2012-02-08 05:53:35 +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
2011-12-13 00:39:48 +01:00
2012-01-08 03:34:22 +01:00
2012-01-08 03:34:22 +01:00
2011-12-13 00:39:48 +01:00
2011-12-28 22:05:24 +01:00
2012-01-01 00:07:31 +01:00
2012-01-22 23:40:24 +01:00
2012-01-29 00:34:59 +01:00
2011-12-13 00:39:48 +01:00
2012-01-08 00:18:36 +01:00
2011-12-10 05:02:00 +01:00
2012-02-02 20:44:22 +01:00
2012-01-04 01:12:34 +01:00
2012-01-28 21:59:01 +01:00
2012-02-02 01:12:46 +01:00
2012-02-06 20:59:59 +01:00
2012-02-07 22:02:40 +01:00
2011-12-14 23:17:59 +01:00
2012-01-26 17:05:57 +01:00
2012-01-14 01:15:42 +01:00
2012-01-17 01:37:59 +01:00
2012-02-09 01:27:12 +01:00
2012-02-09 01:27:12 +01:00
2011-12-31 01:16:45 +01:00
2012-01-29 14:52:56 +01:00
2012-01-29 00:34:59 +01:00
2012-02-05 02:08:03 +01:00
2012-01-29 00:34:59 +01:00
2011-12-10 11:58: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-28 22:01:05 +01:00
2011-12-19 16:30:30 +01:00
2011-12-23 03:25:51 +01:00
2011-12-23 03:25:51 +01:00
2012-02-02 02:24:09 +01:00
2012-01-24 21:08:41 +01:00
2012-01-29 00:34:59 +01:00
2011-12-23 03:25:51 +01:00
2011-12-09 00:05:51 +01:00
2012-01-29 00:34:59 +01:00
2012-02-06 21:03:24 +01:00
2011-12-15 18:38:04 +01:00
2012-02-07 01:40:29 +01:00
2012-01-03 03:25:22 +01:00
2012-01-29 00:34:59 +01:00
2012-01-07 02:30:27 +01:00
2012-02-01 14:37:47 -05: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
2011-12-30 20:00:53 +01:00
2011-12-23 03:25:51 +01:00
2012-02-02 02:24:09 +01:00
2011-12-25 04:15:56 +01:00
2012-01-11 08:56:24 -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
2011-12-14 23:58:10 +01:00
2012-01-29 00:34:59 +01:00
2012-01-25 06:48:30 +01:00
2012-01-14 02:22:09 +01:00
2012-01-29 00:34:59 +01:00
2012-01-15 01:16:54 +01:00
2012-01-29 00:34:59 +01:00
2011-12-17 04:42:04 +01:00
2012-01-07 02:30:27 +01:00
2011-12-23 05:58:32 +01:00
2012-01-01 21:43:44 +01:00
2012-01-26 19:54:38 +01:00
2012-02-01 02:36:09 +01:00
2011-12-19 03:24:32 +01:00
2011-12-12 01:25:37 +01:00
2012-01-30 18:39:08 +01:00
2012-01-29 00:34:59 +01:00
2012-01-15 14:13:25 +01:00
2011-12-17 02:18:16 +01:00
2012-02-09 01:27:12 +01:00
2011-12-23 03:25:51 +01:00
2011-12-23 03:25:51 +01:00
2012-01-25 18:55:32 +01:00
2012-01-12 13:54:41 +01:00
2012-01-12 13:54:41 +01:00
2012-01-26 02:23:56 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-01-08 03:34:22 +01:00
2011-12-13 23:21:37 +01:00
2011-12-18 03:19:40 +01:00
2011-12-13 00:39:48 +01:00
2012-01-08 03:34:22 +01:00
2011-12-31 01:16:45 +01:00
2011-12-29 01:40:34 +01:00
2011-12-29 01:40:34 +01:00
2011-12-16 04:16:01 +01:00
2012-01-13 19:51:19 +01:00
2012-01-12 16:32:55 +01:00
2011-12-11 00:32:25 +01:00
2012-02-06 19:39:24 +01:00
2012-01-08 00:18:36 +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-08 20:54:15 +01:00
2011-12-13 00:39:48 +01:00
2011-12-31 16:31:15 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 07:26:31 +01:00
2011-12-20 19:08:04 +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-01-28 22:08:20 +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-01-28 07:53:34 +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
2011-12-31 16:47:17 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 18:11:40 +01:00
2012-02-09 01:27:12 +01:00
2012-01-29 00:34:59 +01:00
2012-02-04 05:18:45 +01:00
2012-01-08 03:34:22 +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-09 01:27:12 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-18 22:04:14 +01:00
2011-12-13 00:39:48 +01:00
2012-01-07 00:11:43 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 14:37:47 -05:00
2012-01-06 00:51:31 +01:00
2012-01-12 16:32:55 +01:00
2011-12-30 22:32:42 +01:00
2012-01-29 00:34:59 +01:00
2011-12-18 15:28:18 +01:00
2012-01-26 02:23:56 +01:00
2011-12-09 00:05:51 +01:00
2012-02-03 03:51:32 +01:00
2012-02-03 03:51:32 +01:00
2011-12-17 05:04:56 +01:00
2012-01-07 02:30:27 +01:00
2011-12-13 00:39:48 +01:00
2012-01-29 00:34:59 +01:00
2011-12-13 01:26:14 +01:00
2012-01-28 07:53:34 +01:00
2011-12-13 00:39:48 +01:00
2012-02-02 14:31:17 +01:00
2012-01-31 02:46:26 +01:00
2012-02-02 14:31:17 +01:00
2012-01-28 07:53:34 +01:00
2012-02-05 01:34:59 +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-01-21 23:11:27 +01:00
2012-01-28 07:53:34 +01:00
2012-02-09 01:27:12 +01:00
2012-02-09 01:27:12 +01:00
2012-01-12 01:10:32 +01:00
2011-12-18 03:04:44 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-03 03:25:22 +01:00
2012-01-27 17:19:09 -08:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-09 01:27:12 +01:00
2012-01-22 16:38:20 +01:00
2012-01-16 20:32:16 +01:00
2012-01-29 00:34:59 +01:00
2012-02-07 15:48:33 +01:00
2011-12-27 23:51:02 +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-01-31 21:40:53 +01:00
2012-01-30 05:20:58 +01:00
2012-02-03 23:12:10 +01:00
2012-01-15 22:04:25 +01:00
2012-01-23 01:05:20 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2012-02-02 01:12:46 +01:00
2011-12-17 02:18:16 +01:00
2011-12-30 20:00:53 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 02:41:53 +01:00
2012-01-23 19:47:49 +01:00
2011-12-11 01:05:33 +01:00
2011-12-20 04:12:09 +01:00
2012-01-26 22:28:25 +01:00
2011-12-29 15:21:02 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 11:04:19 +01:00
2012-01-28 22:08:20 +01:00
2012-01-29 21:00:19 +01:00
2012-02-03 03:51:32 +01:00
2011-12-23 03:25:51 +01:00
2012-01-22 06:46:24 +01:00
2012-01-29 00:34:59 +01:00
2012-01-06 00:59:08 +01:00
2012-02-09 01:27:12 +01:00
2012-01-28 23:21:03 +01:00
2011-12-13 00:39:48 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 22:08:21 +01:00
2012-01-26 02:23:56 +01:00
2012-01-11 02:44:43 +01:00
2011-12-13 21:08:43 +01:00
2012-01-17 02:37:30 +01:00
2012-01-11 02:44:43 +01:00
2012-01-13 01:29:48 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2012-01-11 02:44:43 +01:00
2011-12-14 23:58:10 +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-01-19 23:31:22 +01:00
2011-12-25 18:55:43 +01:00
2012-02-01 04:43:06 +01:00
2012-01-05 22:24:51 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 04:43:06 +01:00
2012-01-26 20:05:15 +01:00
2011-12-30 20:00:53 +01:00
2012-01-30 05:20:58 +01:00
2011-12-23 15:42:24 +01:00
2011-12-23 11:39:41 +01:00
2012-01-28 01:36:42 +01:00
2011-12-13 00:39:48 +01:00
2011-12-23 03:25:51 +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
2011-12-19 02:34:18 +01:00
2012-01-18 22:04:14 +01:00
2012-02-02 02:24:09 +01:00
2012-01-29 00:34:59 +01:00
2012-01-18 02:08:12 +01:00
2011-12-13 19:54:31 +01:00
2012-01-29 00:34:59 +01:00
2012-02-09 01:27:12 +01:00
2012-02-07 00:46:01 +01:00
2012-02-06 08:00:31 +01:00
2012-02-07 01:40:29 +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-01-12 18:18:23 +01:00
2011-12-31 01:16:45 +01:00
2011-12-12 01:25:37 +01:00
2011-12-31 01:16:45 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 18:18:23 +01:00
2012-01-07 02:30:27 +01:00
2012-01-27 02:09:58 +01:00
2012-02-02 02:24:09 +01:00
2011-12-12 01:25:37 +01:00
2011-12-28 19:05:16 +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-09 01:27:12 +01:00
2011-12-24 22:03:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-02-03 03:51:32 +01:00
2012-01-25 21:12:00 +01:00
2012-02-08 05:53:35 +01:00
2012-02-07 01:40:29 +01:00
2012-01-08 03:34:22 +01:00
2012-01-05 22:24:51 +01:00
2011-12-22 19:48:52 -08:00
2012-01-29 17:50:17 +01:00
2012-01-29 00:34:59 +01:00
2012-01-31 02:46:26 +01:00
2012-02-01 02:36:09 +01:00
2011-12-12 01:25:37 +01:00
2011-12-18 03:04:44 +01:00
2011-12-25 00:10:27 +01:00
2011-12-24 12:41:44 +01:00
2011-12-20 04:12:09 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-29 00:34:59 +01:00
2012-01-03 03:25:22 +01:00
2012-01-03 23:05:54 +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-02 02:24:09 +01:00
f2b20b7a8b