Michael Niedermayer
042f9d62ca
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
configure: Automatically add more flags required on symbian
mem.h: switch doxygen parameter order to match function prototype
doxygen: replace @sa tag by the more readable but equivalent @see
doxygen: use Doxygen markup for authors and web links where appropriate
doxygen: do not include license boilerplate in Doxygen documentation
ac3enc: Mark AVClasses const
ffserver: Replace two loops with one loop.
ffmpeg: Fix the check for experimental codecs
swscale: extend mmx padding.
swscale: clip unscaled colorspace conversion path.
doxygen: misc consistency cosmetics
doc: remove file name from @file directive in Doxygen usage example
doxygen: consistently place brief description
doxygen: place empty line between brief description and detailed description
avformat_open_input(): Add braces to shut up gcc warning.
Conflicts:
libavcodec/8svx.c
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/vaapi_h264.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/vp6.c
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-15 17:51:09 +02:00
2011-05-11 05:47:02 +02:00
2011-07-11 04:23:25 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-07-06 01:34:08 +02:00
2011-05-11 05:47:02 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-07-14 20:44:58 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-07-15 17:51:09 +02:00
2011-06-02 20:06:00 +01:00
2011-05-22 04:53:19 +02:00
2011-06-08 05:25:28 +02:00
2011-07-03 03:14:10 +02:00
2011-06-30 04:32:24 +02:00
2011-07-13 10:39:06 -07:00
2011-04-28 04:26:01 +02:00
2011-06-30 04:32:24 +02:00
2011-07-01 05:35:26 +02:00
2011-07-14 20:44:58 +02:00
2011-06-30 04:32:24 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-05-07 12:03:59 +02:00
2011-04-17 23:43:54 +02:00
2011-07-03 03:14:10 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-07-11 04:23:25 +02:00
2011-07-11 04:23:25 +02:00
2011-07-02 03:24:32 +02:00
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-06-13 16:49:35 -04:00
2011-07-13 16:55:28 -04:00
2011-07-14 02:24:10 +02:00
2011-07-14 02:24:10 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-05-16 05:01:40 +02:00
2011-05-08 13:21:51 +02:00
2011-07-15 17:51:09 +02:00
2011-05-21 01:11:42 +02:00
2011-05-29 03:34:35 +02:00
2011-06-21 03:38:25 +02:00
2011-07-03 03:14:10 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-05-05 03:30:24 +02:00
2011-07-03 03:14:10 +02:00
2011-05-02 16:41:41 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-05-07 12:03:59 +02:00
2011-07-12 01:42:32 +02:00
2011-05-21 02:31:27 +02:00
2011-05-07 12:03:59 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-05-27 02:53:21 +02:00
2011-07-06 23:57:11 +02:00
2011-07-10 17:56:06 +01:00
2011-07-03 03:14:10 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-06-21 03:38:25 +02:00
2011-06-21 03:38:25 +02:00
2011-07-12 01:42:32 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-07-12 01:42:32 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-07-15 17:51:09 +02:00
2011-06-02 20:06:00 +01:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-07-04 00:45:21 +02:00
2011-05-20 05:48:22 +02:00
2011-06-21 21:03:46 -07:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-07-05 02:26:17 +02:00
2011-06-18 11:36:35 +02:00
2011-04-26 22:06:13 +02:00
2011-05-17 13:57:23 +01:00
2011-05-17 13:57:23 +01:00
2011-05-18 05:42:42 +02:00
2011-05-17 13:57:23 +01:00
2011-07-05 02:26:17 +02:00
2011-05-18 05:42:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-15 13:12:47 +02:00
2011-05-02 16:41:41 +02:00
2011-06-03 05:19:30 +02:00
2011-07-09 02:06:40 +02:00
2011-06-26 14:09:48 -07:00
2011-07-13 00:42:11 +02:00
2011-06-08 05:25:28 +02:00
2011-05-01 19:35:55 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-07-06 01:34:08 +02:00
2011-07-02 03:24:32 +02:00
2011-07-11 04:23:25 +02:00
2011-05-22 04:53:19 +02:00
2011-07-05 18:46:23 +02:00
2011-06-08 05:25:28 +02:00
2011-06-09 04:47:19 +02:00
2011-05-24 19:10:28 +02:00
2011-05-07 12:03:59 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-09 17:21:31 +02:00
2011-07-15 00:26:23 +03:00
2011-06-07 15:16:41 -04:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-07-15 17:51:09 +02:00
2011-07-12 01:42:32 +02:00
2011-05-07 12:03:59 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-06-27 03:32:45 +02:00
2011-04-27 03:51:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 00:45:21 +02:00
2011-04-29 10:42:43 +02:00
2011-07-15 17:51:09 +02:00
2011-06-19 03:54:15 +02:00
2011-04-29 18:31:17 +02:00
2011-07-09 02:06:40 +02:00
2011-05-02 16:41:41 +02:00
2011-07-04 00:45:21 +02:00
2011-05-22 04:53:19 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-07-15 17:51:09 +02:00
2011-06-24 03:07:04 +02:00
2011-07-02 03:24:32 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-04-25 00:20:03 +02:00
2011-07-12 01:42:32 +02:00
2011-04-25 00:20:03 +02:00
2011-07-12 01:42:32 +02:00
2011-05-22 04:53:19 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-14 20:44:58 +02:00
2011-06-24 03:07:04 +02:00
2011-06-23 04:49:04 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-14 20:44:58 +02:00
2011-05-02 16:41:41 +02:00
2011-07-06 01:34:08 +02:00
2011-05-11 05:47:02 +02:00
2011-06-15 02:15:25 +02:00
2011-07-06 01:34:08 +02:00
2011-05-11 05:47:02 +02:00
2011-07-06 01:34:08 +02:00
2011-05-11 05:47:02 +02:00
2011-05-10 07:24:36 -04:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-11 00:01:05 +02:00
2011-07-05 02:26:17 +02:00
2011-04-27 03:51:04 +02:00
2011-05-28 18:25:40 +02:00
2011-05-07 12:03:59 +02:00
2011-05-25 11:29:47 +02:00
2011-06-03 05:19:30 +02:00
2011-06-10 04:47:23 +02:00
2011-07-11 04:23:25 +02:00
2011-06-03 05:19:30 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:54 +02:00
2011-05-24 01:31:54 +02:00
2011-06-08 16:38:37 +02:00
2011-05-24 01:31:53 +02:00
2011-05-12 11:56:53 +02:00
2011-05-12 11:56:53 +02:00
2011-04-17 23:59:00 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-06-24 03:07:04 +02:00
2011-06-06 03:33:58 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-05-02 16:41:41 +02:00
2011-04-23 10:10:20 +02:00
2011-04-17 23:59:00 +02:00
2011-04-17 23:59:00 +02:00
2011-06-15 10:57:26 +02:00
2011-07-08 01:05:28 +02:00
2011-05-20 15:28:29 -04:00
2011-07-06 01:34:08 +02:00
2011-05-08 00:02:47 +02:00
2011-07-09 02:06:40 +02:00
2011-04-17 23:59:00 +02:00
2011-04-20 04:48:23 +02:00
2011-07-08 01:05:28 +02:00
2011-07-05 02:26:17 +02:00
2011-07-05 02:26:17 +02:00
2011-06-21 04:45:29 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-07-10 04:28:50 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-07-14 20:44:58 +02:00
2011-05-11 05:47:02 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-09 02:06:40 +02:00
2011-06-05 03:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-05-02 16:41:41 +02:00
2011-04-26 22:06:13 +02:00
2011-07-04 00:45:21 +02:00
2011-04-26 22:06:13 +02:00
2011-06-15 01:16:58 +02:00
2011-05-13 00:22:05 +02:00
2011-04-19 03:09:11 +02:00
2011-05-23 01:23:33 +02:00
2011-06-08 05:25:28 +02:00
2011-05-07 12:03:59 +02:00
2011-07-04 00:45:21 +02:00
2011-07-12 01:42:32 +02:00
2011-07-11 04:23:25 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-05-20 05:48:22 +02:00
2011-06-05 03:00:31 +02:00
2011-05-20 05:48:22 +02:00
2011-06-05 03:00:31 +02:00
2011-06-05 03:00:31 +02:00
2011-07-12 01:42:32 +02:00
2011-05-22 04:53:19 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-14 02:24:10 +02:00
2011-07-12 01:42:32 +02:00
2011-06-21 03:07:11 +02:00
2011-05-18 05:42:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-06-01 00:09:05 +02:00
2011-06-02 05:12:10 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-06-05 03:00:31 +02:00
2011-05-19 12:25:34 +01:00
2011-05-19 12:25:34 +01:00
2011-05-23 17:33:03 +02:00
2011-06-14 04:56:26 +02:00
2011-06-13 11:33:44 +01:00
2011-06-02 05:12:10 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-06-03 05:19:30 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-22 04:53:19 +02:00
2011-07-14 20:44:58 +02:00
2011-07-15 17:51:09 +02:00
2011-05-15 03:25:57 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 09:40:45 +02:00
2011-05-02 16:41:41 +02:00
2011-05-21 13:48:10 +02:00
2011-04-26 18:25:24 +02:00
2011-04-27 03:51:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 12:54:26 +02:00
2011-07-11 05:46:51 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-05-02 16:41:41 +02:00
2011-07-15 17:51:09 +02:00
2011-07-01 05:35:26 +02:00
2011-05-07 12:03:59 +02:00
2011-04-27 20:08:09 +02:00
2011-06-03 05:19:30 +02:00
2011-05-02 16:41:41 +02:00
2011-05-08 01:33:40 +02:00
2011-05-08 20:04:57 +02:00
2011-05-02 16:41:41 +02:00
2011-06-30 04:32:24 +02:00
2011-06-30 04:32:24 +02:00
2011-07-12 01:42:32 +02:00
2011-05-02 16:41:41 +02:00
2011-07-03 03:14:10 +02:00
2011-07-03 03:14:10 +02:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-07-15 17:51:09 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-06-08 16:38:37 +02:00
2011-05-02 16:41:41 +02:00
2011-05-11 05:47:02 +02:00
2011-07-12 01:42:32 +02:00
2011-07-06 10:05:08 +02:00
2011-07-06 10:05:08 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-06-21 03:38:25 +02:00
2011-07-15 17:51:09 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-06-24 03:07:04 +02:00
2011-06-03 05:19:30 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-03 03:14:10 +02:00
2011-06-07 03:37:57 +02:00
2011-07-03 03:14:10 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-07-04 00:45:21 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-20 04:07:34 +02:00
2011-06-20 04:07:34 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-07-12 01:42:32 +02:00
2011-05-04 23:33:59 +02:00
2011-06-02 20:06:00 +01:00
2011-05-12 18:02:28 +02:00
2011-05-02 16:41:41 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-03 03:14:10 +02:00
2011-06-28 18:48:35 +02:00
2011-05-22 04:53:19 +02:00
2011-06-04 06:35:17 +02:00
2011-05-07 12:03:59 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-05-07 12:03:59 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-07-15 17:51:09 +02:00
2011-06-24 03:07:04 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-07-12 01:42:32 +02:00
2011-05-08 19:53:39 +02:00
2011-06-08 05:25:28 +02:00
2011-05-02 16:41:41 +02:00
2011-07-15 17:51:09 +02:00
2011-07-12 01:42:32 +02:00
2011-05-30 00:24:01 +02:00
2011-07-12 01:42:32 +02:00
2011-05-02 16:41:41 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-07-03 03:14:10 +02:00
2011-05-05 03:30:24 +02:00
2011-07-12 01:42:32 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-07 12:03:59 +02:00
2011-07-12 01:42:32 +02:00
2011-06-24 03:07:04 +02:00
2011-07-14 20:44:58 +02:00
2011-06-21 03:38:25 +02:00
2011-05-07 12:03:59 +02:00
2011-07-15 17:51:09 +02:00
2011-05-13 04:40:40 +02:00
2011-07-15 17:51:09 +02:00
2011-05-13 04:40:40 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-05-02 16:41:41 +02:00
2011-07-05 02:26:17 +02:00
2011-05-22 04:53:19 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-06-19 03:54:15 +02:00
2011-04-27 03:51:04 +02:00
2011-06-21 13:17:10 +02:00
2011-05-12 18:02:28 +02:00
2011-06-04 06:35:17 +02:00
2011-07-03 03:14:10 +02:00
2011-07-12 01:42:32 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-04-20 04:48:23 +02:00
2011-07-15 17:51:09 +02:00
2011-05-07 12:03:59 +02:00
2011-06-02 20:06:00 +01:00
042f9d62ca