diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-01-23 18:36:57 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-01-23 18:54:33 +0100 |
| commit | bb539eb13ab024a3acf11fc2253497ad941d0b48 (patch) | |
| tree | 23b3911717f2557930aa5b2642a85bf4d15c6a3f /libavformat | |
| parent | f4e4e5b8416214c762c48cb79b2186bf2714350c (diff) | |
| download | ffmpeg-bb539eb13ab024a3acf11fc2253497ad941d0b48.tar.gz | |
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.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/segment.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index 43be9a27a5..d58d9fe0b4 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -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; |