Browse Source

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.
tags/n1.2
Stefano Sabatini 12 years ago
parent
commit
bb539eb13a
1 changed files with 0 additions and 7 deletions
  1. +0
    -7
      libavformat/segment.c

+ 0
- 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;


Loading…
Cancel
Save