]> git.sesse.net Git - x264/commitdiff
Fix ticks_per_frame check for VFR input
authorFiona Glaser <fiona@x264.com>
Thu, 25 Nov 2010 21:01:16 +0000 (13:01 -0800)
committerFiona Glaser <fiona@x264.com>
Thu, 25 Nov 2010 21:46:07 +0000 (13:46 -0800)
x264.c

diff --git a/x264.c b/x264.c
index c9222a3da2c03483717fa129c3088055e54fbb8e..03bc7061f88a101b1947b87488c55355975f5b3b 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -1630,7 +1630,8 @@ static int encode( x264_param_t *param, cli_opt_t *opt )
     i_start = x264_mdate();
     /* ticks/frame = ticks/second / frames/second */
     ticks_per_frame = (int64_t)param->i_timebase_den * param->i_fps_den / param->i_timebase_num / param->i_fps_num;
-    FAIL_IF_ERROR( ticks_per_frame < 1, "ticks_per_frame invalid: %"PRId64"\n", ticks_per_frame )
+    FAIL_IF_ERROR( ticks_per_frame < 1 && !param->b_vfr_input, "ticks_per_frame invalid: %"PRId64"\n", ticks_per_frame )
+    ticks_per_frame = X264_MAX( ticks_per_frame, 1 );
 
     if( !param->b_repeat_headers )
     {