ffmpeg/libavcodec
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-22 22:26:55 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-05-20 16:29:07 +02:00
2012-03-20 18:46:56 -04:00
2012-02-20 15:08:41 -05:00
2012-05-08 00:25:25 +02:00
2012-03-21 03:03:33 +01:00
2012-04-21 19:28:35 +02:00
2012-05-08 23:18:48 +02:00
2012-05-07 18:55:44 +02:00
2012-05-11 03:33:59 +02:00
2012-05-18 23:34:11 +02:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2011-12-10 11:58:03 +01:00
2012-03-13 01:14:04 +01:00
2012-04-06 22:37:38 +03:00
2012-05-20 16:39:08 +02:00
2012-03-02 18:58:19 +02:00
2012-05-08 22:04:01 +02:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2012-04-22 17:27:54 +02:00
2012-05-08 08:39:37 +02:00
2012-03-30 20:10:39 +02:00
2012-05-18 23:34:11 +02:00
2012-02-14 01:22:38 +01:00
2012-04-22 22:26:55 +02:00
2012-05-09 11:58:08 +02:00
2012-03-22 13:23:08 +01:00
2012-03-24 23:35:09 +01:00
2012-05-18 23:34:11 +02:00
2012-04-16 16:46:53 +02:00
2012-04-15 18:21:53 +02:00
2012-04-27 19:39:19 +02:00
2012-01-07 00:11:43 +01:00
2012-04-22 22:26:55 +02:00
2011-12-17 05:04:56 +01:00
2012-05-13 11:25:24 +02:00
2012-04-22 22:26:55 +02:00
2012-05-07 20:08:56 +02:00
2012-04-12 11:36:17 +02:00
2012-05-05 02:12:40 +02:00
2012-04-06 22:37:38 +03:00
2012-03-19 18:46:34 +01:00
2012-05-08 10:37:13 +02:00
2011-12-13 21:08:43 +01:00
2012-03-07 10:29:52 -08:00
2012-05-22 11:56:18 +00:00
2012-02-16 06:25:32 +01:00
2012-03-19 22:37:06 +01:00
2012-05-12 03:36:17 +02:00
2012-03-24 17:48:03 +01:00
2012-04-22 22:26:55 +02:00
2012-04-16 18:36:40 +02:00
2012-05-08 11:02:12 +02:00
2012-04-15 20:20:43 +02:00
2012-05-12 10:58:08 +02:00
2012-04-07 19:59:00 +02:00
2012-03-25 12:24:15 +02:00
2012-01-08 20:22:12 +01:00
2012-04-10 23:37:30 +02:00
2012-05-05 02:02:56 +02:00
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00
2012-04-21 18:56:19 +01:00
2012-04-15 16:06:52 +02:00
2012-01-23 19:04:35 +01:00
2012-03-18 07:45:41 -07:00