ffmpeg | branch: master | liu jc <jc...@outlook.com> | Wed Aug 24 10:46:41 2016 
+0000| [c0f6eff6a7edaa38a9ea4865ffc2ad36539d9d48] | committer: Michael 
Niedermayer

avformat/tcp: workaround for IOS9 getaddrinfo in IPv6 only network use hardcode 
IPv4 address can not resolve port number.

Signed-off-by: liujingchao <jc...@outlook.com>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0f6eff6a7edaa38a9ea4865ffc2ad36539d9d48
---

 libavformat/tcp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index c105479..fd10a56 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -122,6 +122,14 @@ static int tcp_open(URLContext *h, const char *uri, int 
flags)
     cur_ai = ai;
 
  restart:
+    // workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 
address can not resolve port number.
+    if (cur_ai->ai_family == AF_INET6){
+        struct sockaddr_in6 * sockaddr_v6 = (struct sockaddr_in6 
*)cur_ai->ai_addr;
+        if (!sockaddr_v6->sin6_port){
+            sockaddr_v6->sin6_port = htons(port);
+        }
+    }
+
     fd = ff_socket(cur_ai->ai_family,
                    cur_ai->ai_socktype,
                    cur_ai->ai_protocol);

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to