RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/segment: avoid failure in case -flags +live and -segment_times/frames are specified 

The conflict does not apply any longer, since the M3U8 segment target
duration is re-computed every time a new segment is added to the list.
This commit is contained in:
Stefano Sabatini 2013-01-23 18:36:57 +01:00
parent f4e4e5b841
commit bb539eb13a
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/segment.c
View File

@ -519,13 +519,6 @@ static int seg_write_header(AVFormatContext *s)
return AVERROR(EINVAL);
}
if ((seg->list_flags & SEGMENT_LIST_FLAG_LIVE) && (seg->times_str || seg->frames_str)) {
av_log(s, AV_LOG_ERROR,
"segment_flags +live and segment_times or segment_frames options are mutually exclusive: "
"specify segment_time option if you want a live-friendly list\n");
return AVERROR(EINVAL);
}
if (seg->times_str) {
if ((ret = parse_times(s, &seg->times, &seg->nb_times, seg->times_str)) < 0)
return ret;