|
|
|
@ -1731,7 +1731,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in |
|
|
|
|
|
|
|
|
|
if ((frame_rate || max_frame_rate) && |
|
|
|
|
video_sync_method == VSYNC_PASSTHROUGH) |
|
|
|
|
av_log(NULL, AV_LOG_ERROR, "Using -vsync 0 and -r/-fpsmax can produce invalid output files\n"); |
|
|
|
|
av_log(NULL, AV_LOG_ERROR, "Using -vsync passthrough and -r/-fpsmax can produce invalid output files\n"); |
|
|
|
|
|
|
|
|
|
MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st); |
|
|
|
|
if (frame_aspect_ratio) { |
|
|
|
@ -3191,8 +3191,11 @@ static int opt_vsync(void *optctx, const char *opt, const char *arg) |
|
|
|
|
else if (!av_strcasecmp(arg, "passthrough")) video_sync_method = VSYNC_PASSTHROUGH; |
|
|
|
|
else if (!av_strcasecmp(arg, "drop")) video_sync_method = VSYNC_DROP; |
|
|
|
|
|
|
|
|
|
if (video_sync_method == VSYNC_AUTO) |
|
|
|
|
if (video_sync_method == VSYNC_AUTO) { |
|
|
|
|
video_sync_method = parse_number_or_die("vsync", arg, OPT_INT, VSYNC_AUTO, VSYNC_VFR); |
|
|
|
|
av_log(NULL, AV_LOG_WARNING, "Passing a number to -vsync is deprecated," |
|
|
|
|
" use a string argument as described in the manual.\n"); |
|
|
|
|
} |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|