changeset 5757:b1a108ca71c5 libavformat

Don't explicitly initialize networking in the tcp and udp protocols Networking is always initialized when opening protocols.
author mstorsjo
date Fri, 05 Mar 2010 22:38:48 +0000
parents 7c7fe75728dd
children fcf809c679f2
files tcp.c udp.c
diffstat 2 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tcp.c	Fri Mar 05 22:35:21 2010 +0000
+++ b/tcp.c	Fri Mar 05 22:38:48 2010 +0000
@@ -44,9 +44,6 @@
     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 @@
 {
     TCPContext *s = h->priv_data;
     closesocket(s->fd);
-    ff_network_close();
     av_free(s);
     return 0;
 }
--- a/udp.c	Fri Mar 05 22:35:21 2010 +0000
+++ b/udp.c	Fri Mar 05 22:38:48 2010 +0000
@@ -320,9 +320,6 @@
 
     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 @@
     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;
 }