diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-06-29 19:49:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:49:26 +0200 |
| commit | 8a2ef6d25dc79d472ea7b184c3b95b4658c99838 (patch) | |
| tree | 4320dffeada00b8651740716fe4973d24aeb2690 | |
| parent | f80106e256e051082e507496cdaed564adbd4da9 (diff) | |
| download | ffmpeg-8a2ef6d25dc79d472ea7b184c3b95b4658c99838.tar.gz | |
avformat/hls: Pass a copy of the URL for probing
The segments / url can be modified by the io read when reloading
This may be an alternative or additional fix for Ticket8673
as a further alternative the reload stuff could be disabled during
probing
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b5e39880fb7269b1b3577cee288e06aa3dc1dfa2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/hls.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 2398349b77..7915ee7996 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1721,6 +1721,7 @@ static int hls_read_header(AVFormatContext *s) for (i = 0; i < c->n_playlists; i++) { struct playlist *pls = c->playlists[i]; AVInputFormat *in_fmt = NULL; + char *url; if (!(pls->ctx = avformat_alloc_context())) { ret = AVERROR(ENOMEM); @@ -1756,8 +1757,9 @@ static int hls_read_header(AVFormatContext *s) ffio_init_context(&pls->pb, pls->read_buffer, INITIAL_BUFFER_SIZE, 0, pls, read_data, NULL, NULL); pls->pb.seekable = 0; - ret = av_probe_input_buffer(&pls->pb, &in_fmt, pls->segments[0]->url, - NULL, 0, 0); + url = av_strdup(pls->segments[0]->url); + ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0); + av_free(url); if (ret < 0) { /* Free the ctx - it isn't initialized properly at this point, * so avformat_close_input shouldn't be called. If |