• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · d4d09329
    Michael Niedermayer authored
    * qatar/master:
      lavf: bump minor and add an APIChanges entry for avformat cleanup
      lavf: get rid of ffm-specific stuff in avformat.h
    Not pulled:  avio: deprecate av_protocol_next().
      avio: add a function for iterating though protocol names.
      lavf: rename a parameter of av_sdp_create from buff->buf
      lavf: rename avf_sdp_create to av_sdp_create.
      lavf: make av_guess_image2_codec internal
      avio: make URLProtocol internal.
      avio: make URLContext internal.
      lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
      lavf: use designated initializers for all protocols
      applehttp: don't use deprecated url_ functions.
      avio: move two ff_udp_* functions from avio_internal to url.h
      asfdec: remove a forgotten declaration of nonexistent function
      avio: deprecate the typedef for URLInterruptCB
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d4d09329
tcp.c 5.45 KB