diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-12-15 19:39:16 +0100 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-08 15:40:04 +0200 |
commit | 4effcc399a816689e396b64568beb9a90e83408d (patch) | |
tree | 886470269629a82c34749b98dd747ddbf4e322fe /libavformat | |
parent | e1dfb5128b90f7a3253465599eeb6d6718359da8 (diff) | |
download | ffmpeg-4effcc399a816689e396b64568beb9a90e83408d.tar.gz |
avformat/hlsenc: Factor check out of loop
The check will be true at most once anyway.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/hlsenc.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 3d5b09c963..3cc103af85 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2829,6 +2829,15 @@ static int hls_init(AVFormatContext *s) } hls->recording_time = (hls->init_time ? hls->init_time : hls->time) * AV_TIME_BASE; + + if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) { + // Independent segments cannot be guaranteed when splitting by time + hls->flags &= ~HLS_INDEPENDENT_SEGMENTS; + av_log(s, AV_LOG_WARNING, + "'split_by_time' and 'independent_segments' cannot be enabled together. " + "Disabling 'independent_segments' flag\n"); + } + for (i = 0; i < hls->nb_varstreams; i++) { vs = &hls->var_streams[i]; @@ -2841,14 +2850,6 @@ static int hls_init(AVFormatContext *s) vs->end_pts = AV_NOPTS_VALUE; vs->current_segment_final_filename_fmt[0] = '\0'; - if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) { - // Independent segments cannot be guaranteed when splitting by time - hls->flags &= ~HLS_INDEPENDENT_SEGMENTS; - av_log(s, AV_LOG_WARNING, - "'split_by_time' and 'independent_segments' cannot be enabled together. " - "Disabling 'independent_segments' flag\n"); - } - if (hls->flags & HLS_PROGRAM_DATE_TIME) { time_t now0; time(&now0); |