videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-15 04:38:48 +02:00
Code Releases Activity

avformat/hlsenc: Factor check out of loop

Browse Source 
The check will be true at most once anyway.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-12-15 19:39:16 +01:00
parent e1dfb5128b
commit 4effcc399a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/hlsenc.c
View File

@ -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);