[FFmpeg-cvslog] tls: parse uri path options to underlying tcp URLContext

Peter Ross git at videolan.org
Sun Jul 22 19:41:23 CEST 2012


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sun Jul 22 14:25:02 2012 +1000| [d1146d67ca098b9fa064d185373b7ff04ff26829] | committer: Michael Niedermayer

tls: parse uri path options to underlying tcp URLContext

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/tls.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 1edccb2..2fdf9c5 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -160,7 +160,7 @@ static int tls_open(URLContext *h, const char *uri, int flags)
     TLSContext *c = h->priv_data;
     int ret;
     int port;
-    char buf[200], host[200];
+    char buf[200], host[200], path[1024];
     int numerichost = 0;
     struct addrinfo hints = { 0 }, *ai = NULL;
     const char *proxy_path;
@@ -172,8 +172,8 @@ static int tls_open(URLContext *h, const char *uri, int flags)
     use_proxy = (proxy_path != NULL) && !getenv("no_proxy") &&
         av_strstart(proxy_path, "http://", NULL);
 
-    av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, NULL, 0, uri);
-    ff_url_join(buf, sizeof(buf), "tcp", NULL, host, port, NULL);
+    av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, path, sizeof(path), uri);
+    ff_url_join(buf, sizeof(buf), "tcp", NULL, host, port, "%s", path);
 
     hints.ai_flags = AI_NUMERICHOST;
     if (!getaddrinfo(host, NULL, &hints, &ai)) {



More information about the ffmpeg-cvslog mailing list