[FFmpeg-cvslog] avformat/hls: check segment duration value of EXTINF
Steven Liu
git at videolan.org
Sun Jul 5 20:51:36 EEST 2020
ffmpeg | branch: release/2.8 | Steven Liu <lq at chinaffmpeg.org> | Fri May 29 11:39:05 2020 +0800| [6959358683c7533f586c07a766acc5fe9544d8b2] | committer: Michael Niedermayer
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 at chinaffmpeg.org>
(cherry picked from commit 9dfb19baeb86a8bb02c53a441682c6e9a6e104cc)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6959358683c7533f586c07a766acc5fe9544d8b2
---
libavformat/hls.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index bccaf67fa1..77d7aeba17 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -806,8 +806,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 {
@@ -837,6 +835,11 @@ static int parse_playlist(HLSContext *c, const char *url,
goto fail;
}
+ if (duration < 0.001 * AV_TIME_BASE) {
+ 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;
More information about the ffmpeg-cvslog
mailing list