Commit 814c5641 authored by Martin Storsjö's avatar Martin Storsjö

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
parent 57b5555c
......@@ -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;
}
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment