• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d0ad91c2
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d0ad91c2
ffmpeg.c 219 KB