ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/tcp.c

 /*
  * TCP protocol
  * Copyright (c) 2002 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 26 matching lines @@
     struct addrinfo hints, *ai, *cur_ai;
     int port, fd = -1;
     TCPContext *s = NULL;
     fd_set wfds;
     int fd_max, ret;
     struct timeval tv;
     socklen_t optlen;
     char hostname[1024],proto[1024],path[1024];
     char portstr[10];
 
-    if(!ff_network_init())
-        return AVERROR(EIO);
-
-    url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
+    ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
         &port, path, sizeof(path), uri);
     if (strcmp(proto,"tcp") || port <= 0 || port >= 65536)
         return AVERROR(EINVAL);
 
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
     snprintf(portstr, sizeof(portstr), "%d", port);
     if (getaddrinfo(hostname, portstr, &hints, &ai))
         return AVERROR(EIO);
@@ skipping 124 matching lines @@
             return -1;
         }
     }
     return size1 - size;
 }
 
 static int tcp_close(URLContext *h)
 {
     TCPContext *s = h->priv_data;
     closesocket(s->fd);
-    ff_network_close();
     av_free(s);
     return 0;
 }
 
 static int tcp_get_file_handle(URLContext *h)
 {
     TCPContext *s = h->priv_data;
     return s->fd;
 }
 
 URLProtocol tcp_protocol = {
     "tcp",
     tcp_open,
     tcp_read,
     tcp_write,
     NULL, /* seek */
     tcp_close,
     .url_get_file_handle = tcp_get_file_handle,
 };