diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2020-05-29 11:39:05 +0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 13:33:45 +0200 |
| commit | 2a5219d359933b4d6a4ccf13e241253543fc390e (patch) | |
| tree | 0f9686e12bb1662dbfa52896266ed7ddfc9575da | |
| parent | 919cbe750164f97c3932a87123ca07f9c3b7d081 (diff) | |
| download | ffmpeg-2a5219d359933b4d6a4ccf13e241253543fc390e.tar.gz | |
avformat/hls: check segment duration value of EXTINF
fix ticket: 8673
set the default EXTINF duration to 1ms if duration is smaller than 1ms
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
(cherry picked from commit 9dfb19baeb86a8bb02c53a441682c6e9a6e104cc)
| -rw-r--r-- | libavformat/hls.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 1257cd101c..50321ccbaa 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -861,8 +861,6 @@ static int parse_playlist(HLSContext *c, const char *url, ret = AVERROR(ENOMEM); goto fail; } - seg->duration = duration; - seg->key_type = key_type; if (has_iv) { memcpy(seg->iv, iv, sizeof(iv)); } else { @@ -892,6 +890,13 @@ static int parse_playlist(HLSContext *c, const char *url, goto fail; } + if (duration < 0.001 * AV_TIME_BASE) { + av_log(c->ctx, AV_LOG_WARNING, "Cannot get correct #EXTINF value of segment %s," + " set to default value to 1ms.\n", seg->url); + duration = 0.001 * AV_TIME_BASE; + } + seg->duration = duration; + seg->key_type = key_type; dynarray_add(&pls->segments, &pls->n_segments, seg); is_segment = 0; |