From 1cf769740c0fd143cb03b4290ba5238fce13eff6 Mon Sep 17 00:00:00 2001
From: Fiona Glaser <fiona@x264.com>
Date: Thu, 25 Nov 2010 13:01:16 -0800
Subject: [PATCH] Fix ticks_per_frame check for VFR input

---
 x264.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x264.c b/x264.c
index c9222a3d..03bc7061 100644
--- 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 )
     {
-- 
2.40.0