xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-18 17:16:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avformat/hls: Pass a copy of the URL for probing

Browse Source 
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>
This commit is contained in:
Michael Niedermayer 2020-06-29 19:49:41 +02:00
parent 1379bbc154
commit b5e39880fb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/hls.c
View File

@ -1946,6 +1946,7 @@ static int hls_read_header(AVFormatContext *s)
/* Open the demuxer for each playlist */ /* Open the demuxer for each playlist */
for (i = 0; i < c->n_playlists; i++) { for (i = 0; i < c->n_playlists; i++) {
struct playlist *pls = c->playlists[i]; struct playlist *pls = c->playlists[i];
char *url;
ff_const59 AVInputFormat *in_fmt = NULL; ff_const59 AVInputFormat *in_fmt = NULL;
if (!(pls->ctx = avformat_alloc_context())) { if (!(pls->ctx = avformat_alloc_context())) {
@ -1983,8 +1984,9 @@ static int hls_read_header(AVFormatContext *s)
read_data, NULL, NULL); read_data, NULL, NULL);
pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4;
pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE;
ret = av_probe_input_buffer(&pls->pb, &in_fmt, pls->segments[0]->url, url = av_strdup(pls->segments[0]->url);
NULL, 0, 0); ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0);
av_free(url);
if (ret < 0) { if (ret < 0) {
/* Free the ctx - it isn't initialized properly at this point, /* Free the ctx - it isn't initialized properly at this point,
* so avformat_close_input shouldn't be called. If * so avformat_close_input shouldn't be called. If