[x264-devel] commit: Fix 10L: Remove needless error check (Yusuke Nakamura )

git at videolan.org git at videolan.org
Tue Apr 6 21:48:27 CEST 2010


x264 | branch: master | Yusuke Nakamura <muken.the.vfrmaniac at gmail.com> | Mon Mar 29 13:51:02 2010 +0900| [ae834029cad9401b30cd529cf8c84db41aac776d] | committer: Jason Garrett-Glaser 

Fix 10L: Remove needless error check
This error check was for cfr input + --timebase, but that doesn't happen, and brings about a bug with vfr input.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=ae834029cad9401b30cd529cf8c84db41aac776d
---

 x264.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/x264.c b/x264.c
index f00afce..43d3035 100644
--- a/x264.c
+++ b/x264.c
@@ -1214,12 +1214,6 @@ generic_option:
         }
         opt->timebase_convert_multiplier = ((double)i_user_timebase_den / param->i_timebase_den)
                                          * ((double)param->i_timebase_num / i_user_timebase_num);
-        if( opt->timebase_convert_multiplier < 1 )
-        {
-            fprintf( stderr, "x264 [error]: timebase you specified will generate nonmonotonic pts: %d/%d\n",
-                     i_user_timebase_num, i_user_timebase_den );
-            return -1;
-        }
         param->i_timebase_num = i_user_timebase_num;
         param->i_timebase_den = i_user_timebase_den;
         param->b_vfr_input = 1;



More information about the x264-devel mailing list