diff options
| author | Martin Storsjö <martin@martin.st> | 2010-01-22 16:10:08 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-01-22 16:10:08 +0000 |
| commit | 7c823d8b7f4ad7cb7da0152ce644108cb22dd854 (patch) | |
| tree | cded853d596c20fe97cb8afd8bde4c5311691b1b /libavformat/udp.c | |
| parent | 00eb13e05f3fe868ae33055945fad6408d1be3b4 (diff) | |
Rename a function which is no longer ipv6-specific. Patch by Martin Storsjö
<$firstname () $firstname st>.
Originally committed as revision 21382 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/udp.c')
| -rw-r--r-- | libavformat/udp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/udp.c b/libavformat/udp.c index c9560564e8..9c21023672 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -135,7 +135,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) { return 0; } -static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, int type, int family, int flags) { +static struct addrinfo* udp_resolve_host(const char *hostname, int port, int type, int family, int flags) { struct addrinfo hints, *res = 0; int error; char sport[16]; @@ -153,7 +153,7 @@ static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, in hints.ai_family = family; hints.ai_flags = flags; if ((error = getaddrinfo(node, service, &hints, &res))) { - av_log(NULL, AV_LOG_ERROR, "udp_ipv6_resolve_host: %s\n", gai_strerror(error)); + av_log(NULL, AV_LOG_ERROR, "udp_resolve_host: %s\n", gai_strerror(error)); } return res; @@ -163,7 +163,7 @@ static int udp_set_url(struct sockaddr_storage *addr, const char *hostname, int struct addrinfo *res0; int addr_len; - res0 = udp_ipv6_resolve_host(hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); + res0 = udp_resolve_host(hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); if (res0 == 0) return AVERROR(EIO); memcpy(addr, res0->ai_addr, res0->ai_addrlen); addr_len = res0->ai_addrlen; @@ -194,7 +194,7 @@ static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr, int * if (((struct sockaddr *) &s->dest_addr)->sa_family) family = ((struct sockaddr *) &s->dest_addr)->sa_family; - res0 = udp_ipv6_resolve_host(0, s->local_port, SOCK_DGRAM, family, AI_PASSIVE); + res0 = udp_resolve_host(0, s->local_port, SOCK_DGRAM, family, AI_PASSIVE); if (res0 == 0) goto fail; for (res = res0; res; res=res->ai_next) { |