ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/udp.c

 /*
  * UDP prototype streaming system
  * Copyright (c) 2000, 2001, 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 141 matching lines @@
         service = sport;
     }
     if ((hostname) && (hostname[0] != '\0') && (hostname[0] != '?')) {
         node = hostname;
     }
     memset(&hints, 0, sizeof(hints));
     hints.ai_socktype = type;
     hints.ai_family   = family;
     hints.ai_flags = flags;
     if ((error = getaddrinfo(node, service, &hints, &res))) {
+        res = NULL;
         av_log(NULL, AV_LOG_ERROR, "udp_resolve_host: %s\n", gai_strerror(error));
     }
 
     return res;
 }
 
 static int udp_set_url(struct sockaddr_storage *addr,
                        const char *hostname, int port)
 {
     struct addrinfo *res0;
@@ skipping 85 matching lines @@
  * @param s1 media file context
  * @param uri of the remote server
  * @return zero if no error.
  */
 int udp_set_remote_url(URLContext *h, const char *uri)
 {
     UDPContext *s = h->priv_data;
     char hostname[256];
     int port;
 
-    url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri);
+    ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri);
 
     /* set the destination address */
     s->dest_addr_len = udp_set_url(&s->dest_addr, hostname, port);
     if (s->dest_addr_len < 0) {
         return AVERROR(EIO);
     }
     s->is_multicast = is_multicast_address(&s->dest_addr);
 
     return 0;
 }
@@ skipping 34 matching lines @@
     const char *p;
     char buf[256];
     struct sockaddr_storage my_addr;
     int len;
 
     h->is_streamed = 1;
     h->max_packet_size = 1472;
 
     is_output = (flags & URL_WRONLY);
 
-    if(!ff_network_init())
-        return AVERROR(EIO);
-
     s = av_mallocz(sizeof(UDPContext));
     if (!s)
         return AVERROR(ENOMEM);
 
     h->priv_data = s;
     s->ttl = 16;
     s->buffer_size = is_output ? UDP_TX_BUF_SIZE : UDP_MAX_PKT_SIZE;
 
     p = strchr(uri, '?');
     if (p) {
         s->reuse_socket = find_info_tag(buf, sizeof(buf), "reuse", p);
         if (find_info_tag(buf, sizeof(buf), "ttl", p)) {
             s->ttl = strtol(buf, NULL, 10);
         }
         if (find_info_tag(buf, sizeof(buf), "localport", p)) {
             s->local_port = strtol(buf, NULL, 10);
         }
         if (find_info_tag(buf, sizeof(buf), "pkt_size", p)) {
             h->max_packet_size = strtol(buf, NULL, 10);
         }
         if (find_info_tag(buf, sizeof(buf), "buffer_size", p)) {
             s->buffer_size = strtol(buf, NULL, 10);
         }
     }
 
     /* fill the dest addr */
-    url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri);
+    ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri);
 
-    /* XXX: fix url_split */
+    /* XXX: fix ff_url_split */
     if (hostname[0] == '\0' || hostname[0] == '?') {
         /* only accepts null hostname if input */
         if (flags & URL_WRONLY)
             goto fail;
     } else {
         udp_set_remote_url(h, uri);
     }
 
     if (s->is_multicast && !(h->flags & URL_WRONLY))
         s->local_port = port;
@@ skipping 110 matching lines @@
     return size;
 }
 
 static int udp_close(URLContext *h)
 {
     UDPContext *s = h->priv_data;
 
     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;
 }
 
 URLProtocol udp_protocol = {
     "udp",
     udp_open,
     udp_read,
     udp_write,
     NULL, /* seek */
     udp_close,
     .url_get_file_handle = udp_get_file_handle,
 };