virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avformat/hls: check segment duration value of EXTINF

Browse Source 
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 9dfb19baeb)
This commit is contained in:
Steven Liu 2020-05-29 11:39:05 +08:00 committed by Michael Niedermayer
parent cb438cf889
commit c229e5e80f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/hls.c
View File

@ -867,8 +867,6 @@ static int parse_playlist(HLSContext *c, const char *url,
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
seg->duration = duration;
seg->key_type = key_type;
if (has_iv) { if (has_iv) {
memcpy(seg->iv, iv, sizeof(iv)); memcpy(seg->iv, iv, sizeof(iv));
} else { } else {
@ -898,6 +896,13 @@ static int parse_playlist(HLSContext *c, const char *url,
goto fail; 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); dynarray_add(&pls->segments, &pls->n_segments, seg);
is_segment = 0; is_segment = 0;