aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-11-21 11:31:53 +0200
committerMartin Storsjö <martin@martin.st>2013-11-22 14:27:08 +0200
commit8c929098141ebc94ad3f303521c520bb3dc6d8f6 (patch)
treef913ec1fb53497973446408c9cccfc381c86be6d
parentbe4edda6731a341d3fdeaa0e57753dc396790362 (diff)
downloadffmpeg-8c929098141ebc94ad3f303521c520bb3dc6d8f6.tar.gz
hls: Check whether the AVIOContext contains a new redirected URL
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>
-rw-r--r--libavformat/hls.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index ea16f8abf3..14fdf8f826 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;