Michael Niedermayer
d0ad91c258
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
http: Add support for reading http POST reply headers
http: Add http_shutdown() for ending writing of posts
tcp: Allow signalling end of reading/writing
avio: Add a function for signalling end of reading/writing
lavfi: fix comment, audio is supported now.
lavfi: fix incorrect comment.
lavfi: remove avfilter_null_* from public API on next bump.
lavfi: remove avfilter_default_* from public API on next bump.
lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
avfiltergraph: smarter sample format selection.
avconv: rename transcode_audio/video to decode_audio/video.
asyncts: reset delta to 0 when it's not used.
x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
dwt: return errors from ff_slice_buffer_init()
Conflicts:
ffmpeg.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/formats.c
libavfilter/version.h
libavfilter/vf_blackframe.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_showinfo.c
libavfilter/video.c
libavfilter/video.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-23 21:48:31 +02:00
2012-04-16 15:27:39 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2011-12-03 03:00:30 +01:00
2012-01-31 07:50:31 +01:00
2012-04-06 22:52:01 +02:00
2011-11-12 02:50:25 +01:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02:00
2012-05-21 08:51:50 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02: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
2011-11-05 16:51:25 +01:00
2012-03-29 04:11:10 +02:00
2011-03-19 13:33:20 +00:00
2012-04-07 22:41:37 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-05-01 23:20:52 +02:00
2012-04-01 21:21:13 +02:00
2011-03-19 13:33:20 +00:00
2012-03-25 01:56:53 +01:00
2012-03-25 01:56:53 +01:00
2012-05-22 14:59:02 +02:00
2011-11-28 01:07:11 +01:00
2012-05-23 19:49:25 +02:00
2012-04-06 22:52:01 +02:00
2011-12-19 11:57:34 +01:00
2012-05-23 21:48:31 +02:00
2012-04-19 21:23:52 +02:00
2012-04-28 20:45:06 +02:00
2012-01-28 07:53:34 +01:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2012-03-03 00:23:10 +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-03-03 04:30:49 +01:00
2012-04-06 19:19:59 +03:00
2012-02-16 01:34:37 +01:00
2012-02-06 02:04:09 +01:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2012-04-06 22:52:01 +02:00
2012-01-23 17:18:13 +01:00
2011-05-27 23:48:22 +02:00
2012-05-10 04:17:03 +02:00
2012-03-05 16:27:31 -05: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
2012-02-16 01:34:37 +01:00
2012-04-20 22:18:26 +02:00
2012-04-06 22:52:01 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-05-08 22:02:59 +02:00
2012-02-16 01:34:37 +01:00
2012-05-08 22:02:59 +02:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-05-05 20:22:09 +02:00
2011-08-09 19:56:25 +02:00
2012-05-07 02:42:00 +02:00
2012-03-01 03:17:11 +01:00
2011-05-22 04:53:19 +02:00
2012-01-28 07:53:34 +01:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2012-04-06 22:52:01 +02:00
2011-07-17 20:12:02 +02:00
2012-04-06 22:52:01 +02:00
2011-12-11 01:05:33 +01:00
2012-04-06 22:52:01 +02:00
2011-03-19 13:33:20 +00:00
2012-01-28 07:53:34 +01:00
2012-03-20 07:53:40 +01:00
2012-05-21 21:19:43 +02:00
2012-05-21 23:53:39 +02:00
2012-05-20 19:50:32 -04: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-05-01 23:20:52 +02:00
2012-03-19 13:33:24 +01:00
2011-03-19 13:33:20 +00:00
2012-05-14 20:17:24 +02: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-02-21 05:10:12 +01:00
2012-02-15 01:52:14 +01:00
2012-05-23 21:48:31 +02:00
2011-11-11 02:50:35 +01:00
2012-03-14 02:10:11 +01:00
2012-03-14 02:10:11 +01:00
2012-01-28 07:53:34 +01:00
2011-06-09 04:47:19 +02:00
2012-01-29 00:34:59 +01:00
2012-05-20 16:29:08 +02: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-05-20 22:58:04 +02:00
2012-05-20 22:58:04 +02:00
2012-05-20 22:58:04 +02:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-03-18 23:39:42 +01:00
2012-05-01 23:20:52 +02:00
2012-03-21 01:33:53 +01:00
2012-01-28 07:53:34 +01:00
2012-05-08 08:41:26 +02:00
2012-04-14 22:37:43 +02:00
2012-05-20 22:58:04 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-03 19:37:14 +02:00
2012-05-03 19:37:14 +02:00
2012-04-19 21:43:15 +02:00
2012-04-14 18:21:19 +02:00
2012-03-12 06:04:37 +01:00
2012-01-28 07:53:34 +01:00
2012-05-21 08:51:50 +02: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-03-31 12:37:42 +02:00
2011-05-27 23:48:22 +02:00
2012-05-21 08:51:50 +02:00
2011-05-24 23:34:24 +02:00
2012-03-01 03:17:11 +01:00
2012-04-30 22:18:43 +02:00
2012-05-21 23:53:39 +02:00
2012-05-21 23:53:39 +02:00
2011-12-02 00:51:11 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-03-26 20:03:57 +02:00
2012-04-27 19:19:36 +02:00
2011-04-04 01:29:40 +02:00
2012-01-28 07:53:34 +01:00
2012-03-23 00:50:49 +01:00
2012-05-01 23:20:52 +02: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-03-22 13:56:44 -07:00
2012-02-28 20:48:43 +01:00
2012-05-19 20:31:24 +02:00
2012-05-15 07:41:23 +02:00
2012-03-21 01:33:53 +01:00
2012-02-17 00:35:06 +01:00
2012-05-08 03:47:58 +02:00
2012-05-13 16:49:17 +02:00
2012-05-05 14:46:38 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2011-03-19 13:33:20 +00:00
2012-05-06 21:53:19 +02:00
2012-05-14 02:41:36 +02:00
2012-02-29 00:30:35 +01:00
2012-05-11 14:13:07 +02:00
2012-03-09 22:25:32 +01:00
2012-03-10 18:32:02 +01:00
2012-01-28 07:53:34 +01:00
2012-05-20 22:58:04 +02:00
2012-04-06 22:52:01 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-05-22 15:04:59 +02:00
2012-04-03 10:11:27 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-29 00:34:59 +01:00
2012-02-03 19:51:13 +01:00
2012-05-06 21:53:19 +02:00
2012-04-06 22:52:01 +02:00
2012-05-08 10:37:13 +02:00
2011-03-19 13:33:20 +00:00
2012-05-16 03:13:35 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-14 14:15:34 +02:00
2011-09-26 13:51:29 +02:00
2012-04-01 00:36:43 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2012-03-29 04:11:10 +02:00
2012-04-18 15:30:34 +02:00
2012-03-23 04:29:33 +01:00
2011-11-30 20:34:45 +01:00
2012-05-05 00:00:40 +02:00
2012-05-06 12:00:19 +02:00
2012-04-16 18:36:39 +02:00
2012-04-16 18:36:39 +02:00
2012-05-10 17:22:27 +02:00
2012-02-29 14:26:14 +01:00
2012-05-10 02:25:41 +02:00
2012-03-21 01:33:53 +01:00
2012-02-18 12:26:35 +01:00
2012-05-23 21:48:31 +02:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-05-01 23:20:52 +02:00
2011-09-24 22:39:52 +02:00
2012-02-28 07:20:36 +01:00
2012-03-04 04:26:04 +01:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-03-10 01:12:08 +01:00
2012-05-22 14:59:02 +02:00
2012-02-01 02:36:09 +01:00
2012-04-13 00:39:19 +02:00
2011-03-19 13:33:20 +00:00
2012-04-06 22:52:01 +02:00
2012-03-06 06:03:32 +01:00
2011-07-14 20:44:58 +02:00
2012-05-16 22:15:59 +02:00
2011-11-28 01:07:11 +01:00
2012-02-29 00:30:35 +01:00
2012-03-20 00:03:19 +01:00
2011-03-19 13:33:20 +00:00
2012-04-20 22:18:26 +02:00
2012-04-29 13:03:15 +02:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2012-05-01 23:20:52 +02: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-05-19 00:52:25 +02:00
2012-02-24 02:57:18 +01:00
2012-02-17 00:35:06 +01:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-02-19 01:47:10 +01:00
2011-12-02 00:51:11 +01:00
2012-02-18 17:31:55 +02:00
2012-02-19 01:47:10 +01:00
2012-05-06 21:53:19 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-02-07 01:40:29 +01: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
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2011-04-09 03:17:07 +02: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
2011-06-17 05:49:58 +02:00
2012-01-29 00:34:59 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-04-06 22:52:01 +02:00
2012-03-20 00:03:19 +01:00
2012-02-17 00:35:06 +01:00
2012-05-10 02:25:41 +02:00
2012-05-10 02:25:41 +02:00
2011-03-19 13:33:20 +00:00
2012-04-08 20:55:11 +02:00
2012-03-20 00:03:19 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2012-02-23 16:00:22 +01:00
2012-05-10 00:01:45 +02:00
2012-03-29 04:11:10 +02:00
2012-05-04 14:40:22 +02:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-04-16 02:18:09 +02:00
2012-04-28 20:45:06 +02:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-04-22 11:23:58 +02: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-05-20 19:50:32 -04:00
2012-05-01 23:20:52 +02:00
2011-03-19 13:33:20 +00:00
2012-05-01 23:20:52 +02: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
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2012-05-21 23:53:39 +02:00
2012-05-23 21:48:31 +02:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-01-05 23:56:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-05-14 19:32:43 +02:00
2012-05-23 21:48:31 +02:00
2012-05-23 19:04:23 +02:00
2012-04-06 22:52:01 +02:00
2011-12-30 20:00:53 +01:00
2012-05-21 23:53:39 +02:00
2011-03-19 13:33:20 +00:00
2012-02-16 01:34:37 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2011-06-09 04:47:19 +02:00
2011-12-13 00:39:48 +01:00
2012-03-04 04:26:04 +01:00
2012-05-21 23:53:39 +02:00
2012-01-28 07:53:34 +01:00
2012-02-01 04:43:06 +01:00
2012-03-27 11:58:15 -04:00
2012-01-27 10:51:57 +01:00
2011-09-08 01:55:07 +02:00
2012-04-22 15:29:34 +02:00
2011-12-03 03:24:32 +01:00
2012-02-10 01:20:07 +01:00
2012-03-21 01:33:53 +01:00
2012-04-21 19:42:44 +02:00
2012-03-22 23:16:49 +01:00
2012-04-06 22:52:01 +02:00
2012-05-08 16:53:03 +02:00
d0ad91c258