]> git.sesse.net Git - x264/commitdiff
Make --fps force CFR mode
authorFiona Glaser <fiona@x264.com>
Thu, 14 Jan 2010 05:07:30 +0000 (00:07 -0500)
committerFiona Glaser <fiona@x264.com>
Thu, 14 Jan 2010 05:07:30 +0000 (00:07 -0500)
x264.c

diff --git a/x264.c b/x264.c
index 8c280aae5f1cd0598fcf699f91e74c04c8f61a15..b3ab9b6d04554f70721eaa63621bfc182002570c 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -1127,6 +1127,7 @@ static int Parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt )
                 goto generic_option;
             case OPT_FPS:
                 b_user_fps = 1;
+                param->b_vfr_input = 0;
                 goto generic_option;
             case OPT_INTERLACED:
                 b_user_interlaced = 1;