aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Liu <lq@chinaffmpeg.org>2020-05-29 11:39:05 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-01 12:49:26 +0200
commitf80106e256e051082e507496cdaed564adbd4da9 (patch)
treea7b83868786d439a7eba53811b6cd764a6bb7bbf
parentbf3757f54b3fd8e4277286cd3b9f70701d564222 (diff)
downloadffmpeg-f80106e256e051082e507496cdaed564adbd4da9.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.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 87948726da..2398349b77 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -802,8 +802,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 {
@@ -833,6 +831,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;