summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-10-23 23:27:46 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-10-23 23:27:46 +0200
commit7a649e07830cf9aa83881b5c80bd4223b77ba523 (patch)
treeb8074a2b029a46e491a4afb10e42cd5e4e2ec644 /ffmpeg_opt.c
parent70c9d400087c182ce670fcc008b05c2edabd73e9 (diff)
Print an error if -r and -vsync 0 are used together.
Fixes ticket #4041.
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 13152d0970..7a5eaa5b2f 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1277,6 +1277,8 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
exit_program(1);
}
+ if (frame_rate && video_sync_method == VSYNC_PASSTHROUGH)
+ av_log(NULL, AV_LOG_ERROR, "Using -vsync 0 and -r can produce invalid output files\n");
MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
if (frame_aspect_ratio) {