Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 May 2012 19:41:13 +0000 (21:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 May 2012 19:48:31 +0000 (21:48 +0200)
commitd0ad91c258821708ce21b4ae53018922ef1f5614
tree95332c7c22137cedd30a84bcc51cf6924ee2d631
parentd0f78e77e1cde44532d613525a4f521e8effe3ed
parent3f9d6e423978f5e905def374e9c2e9166e3ebb2c
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>
39 files changed:
ffmpeg.c
libavcodec/dwt.c
libavcodec/dwt.h
libavcodec/snowdec.c
libavcodec/x86/dsputil_yasm.asm
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/formats.c
libavfilter/formats.h
libavfilter/split.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fifo.c
libavfilter/vf_format.c
libavfilter/vf_null.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vf_settb.c
libavfilter/vf_showinfo.c
libavfilter/vf_slicify.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/video.h
libavformat/avio.c
libavformat/http.c
libavformat/os_support.h
libavformat/tcp.c
libavformat/url.h
tools/lavfi-showfiltfmts.c