aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2012-07-22 14:25:02 +1000
committerMichael Niedermayer <michaelni@gmx.at>2012-07-22 19:12:15 +0200
commitd1146d67ca098b9fa064d185373b7ff04ff26829 (patch)
tree777d4e51f2649a1f59369a049db1bf6d5cfe72ba
parentb2460858f64b2070d84dd861d4bbd16acfb9b0e9 (diff)
downloadffmpeg-d1146d67ca098b9fa064d185373b7ff04ff26829.tar.gz
tls: parse uri path options to underlying tcp URLContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/tls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/tls.c b/libavformat/tls.c
index 1edccb22e7..2fdf9c5fc3 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)) {