From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Sun, 29 Nov 2015 15:12:38 +0000 (+0100)
Subject: Merge commit '12b14382861fbf19378afcddaa19cd9a949a86a3'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a6dac0b41054510eb88210197246f9fc40c5781c;hp=bf54377001369a4d44db1b2db1c1430582180d82;p=ffmpeg

Merge commit '12b14382861fbf19378afcddaa19cd9a949a86a3'

* commit '12b14382861fbf19378afcddaa19cd9a949a86a3':
  udp: Provide additional information on getaddrinfo failure

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
---

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 65e73063392..4aede0c6ed2 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -258,7 +258,9 @@ static struct addrinfo *udp_resolve_host(URLContext *h,
     hints.ai_flags = flags;
     if ((error = getaddrinfo(node, service, &hints, &res))) {
         res = NULL;
-        av_log(h, AV_LOG_ERROR, "udp_resolve_host: %s\n",
+        av_log(h, AV_LOG_ERROR, "getaddrinfo(%s, %s): %s\n",
+               node ? node : "unknown",
+               service ? service : "unknown",
                gai_strerror(error));
     }