summaryrefslogtreecommitdiff
path: root/libavformat/hls.c
diff options
context:
space:
mode:
authorSteven Liu <lq@chinaffmpeg.org>2020-05-29 11:39:05 +0800
committerSteven Liu <lq@chinaffmpeg.org>2020-06-10 09:22:37 +0800
commit9dfb19baeb86a8bb02c53a441682c6e9a6e104cc (patch)
tree826381a4edeea39a867dcc8570433a75f003ca64 /libavformat/hls.c
parentea1940c6e2ead234f6e563c095bb67d352e3328f (diff)
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>
Diffstat (limited to 'libavformat/hls.c')
-rw-r--r--libavformat/hls.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 3ca6b90b19..17b3dd545d 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -894,8 +894,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 {
@@ -937,6 +935,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;