Don't explicitly initialize networking in the tcp and udp protocols

Networking is always initialized when opening protocols.

Originally committed as revision 22227 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index a8cf80f..0f097d0 100644 (file)
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -44,9 +44,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
     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),
         &port, path, sizeof(path), uri);
     if (strcmp(proto,"tcp") || port <= 0 || port >= 65536)
@@ -192,7 +189,6 @@ static int tcp_close(URLContext *h)
 {
     TCPContext *s = h->priv_data;
     closesocket(s->fd);
-    ff_network_close();
     av_free(s);
     return 0;
 }

diff --git a/libavformat/udp.c b/libavformat/udp.c
index c548014..1b09457 100644 (file)
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -320,9 +320,6 @@ static int udp_open(URLContext *h, const char *uri, int flags)
 
     is_output = (flags & URL_WRONLY);
 
-    if(!ff_network_init())
-        return AVERROR(EIO);
-
     s = av_mallocz(sizeof(UDPContext));
     if (!s)
         return AVERROR(ENOMEM);
@@ -482,7 +479,6 @@ static int udp_close(URLContext *h)
     if (s->is_multicast && !(h->flags & URL_WRONLY))
         udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr);
     closesocket(s->udp_fd);
-    ff_network_close();
     av_free(s);
     return 0;
 }