diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 23:32:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 23:32:36 +0200 |
| commit | 20aac40571a51aa5c32dc15958a73a23158986e2 (patch) | |
| tree | f7841e56381a8089b344439ad057e09b60b49602 | |
| parent | 00dbd7c4aee6ad2db8f99cda17b0f5f92ec20720 (diff) | |
| parent | 7a649e07830cf9aa83881b5c80bd4223b77ba523 (diff) | |
| download | ffmpeg-20aac40571a51aa5c32dc15958a73a23158986e2.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Print an error if -r and -vsync 0 are used together.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 2 |
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) { |