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

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Jan 23 18:36:57 2013 +0100| [bb539eb13ab024a3acf11fc2253497ad941d0b48] | committer: Stefano Sabatini

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb539eb13ab024a3acf11fc2253497ad941d0b48
---

 libavformat/segment.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 43be9a2..d58d9fe 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;