From 8c929098141ebc94ad3f303521c520bb3dc6d8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 21 Nov 2013 11:31:53 +0200
Subject: [PATCH] hls: Check whether the AVIOContext contains a new redirected
URL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This allows both the main playlist itself as well as the variant
playlists to handle redirects combined with relative URLs.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavformat/hls.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index ea16f8abf35..14fdf8f826d 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -211,6 +211,7 @@ static int parse_playlist(HLSContext *c, const char *url,
char line[1024];
const char *ptr;
int close_in = 0;
+ uint8_t *new_url = NULL;
if (!in) {
close_in = 1;
@@ -219,6 +220,9 @@ static int parse_playlist(HLSContext *c, const char *url,
return ret;
}
+ if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0)
+ url = new_url;
+
read_chomp_line(in, line, sizeof(line));
if (strcmp(line, "#EXTM3U")) {
ret = AVERROR_INVALIDDATA;
@@ -319,6 +323,7 @@ static int parse_playlist(HLSContext *c, const char *url,
var->last_load_time = av_gettime();
fail:
+ av_free(new_url);
if (close_in)
avio_close(in);
return ret;
--
GitLab