From 8c4ca4aa5aa998e31337e30ff30ebf48f534acc2 Mon Sep 17 00:00:00 2001 From: Simon Thelen Date: Fri, 10 Oct 2014 23:04:01 +0200 Subject: ffmpeg_opt: abort if -to <= -ss Makes ffmpeg abort instead of continuing when stop_time <= start_time. Closes ticket #4015. Signed-off-by: Simon Thelen Signed-off-by: Michael Niedermayer --- ffmpeg_opt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ffmpeg_opt.c') diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 10aaa3a6af..c518ae11b0 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1732,8 +1732,8 @@ static int open_output_file(OptionsContext *o, const char *filename) if (o->stop_time != INT64_MAX && o->recording_time == INT64_MAX) { int64_t start_time = o->start_time == AV_NOPTS_VALUE ? 0 : o->start_time; if (o->stop_time <= start_time) { - av_log(NULL, AV_LOG_WARNING, "-to value smaller than -ss; ignoring -to.\n"); - o->stop_time = INT64_MAX; + av_log(NULL, AV_LOG_ERROR, "-to value smaller than -ss; aborting.\n"); + exit_program(1); } else { o->recording_time = o->stop_time - start_time; } -- cgit v1.2.3