Re-allow constant frame rates. The MacGui should probably be updated to always use...

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1464 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/sync.c b/libhb/sync.c
index d783985315ad1ff12b864f0c626ee79c9102e781..34b426f6dd5439dda41f6b5e45894c84e5c1788f 100644 (file)
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -512,7 +512,7 @@ static int SyncVideo( hb_work_object_t * w )
         }
 
         int64_t duration;
-        if ( job->mux & HB_MUX_AVI )
+        if ( job->mux & HB_MUX_AVI || job->title->rate_base != job->vrate_base )
         {
             /*
              * The concept of variable frame rate video was a bit too advanced

diff --git a/libhb/work.c b/libhb/work.c
index 6efe796db70b0568b3304d117f2324d1fcd37e8c..503403edde1c4b49f754d0803f1b67bec8e2d0ee 100644 (file)
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -165,6 +165,8 @@ static void do_job( hb_job_t * job, int cpu_count )
 
     if ( job->vfr )
     {
+        job->vrate_base = title->rate_base;
+        
         int detelecine_present = 0;
         if ( job->filters )
         {
@@ -209,7 +211,7 @@ static void do_job( hb_job_t * job, int cpu_count )
 
     if( job->vfr)
     {
-        hb_log( " + video frame rate: variable (detected %.3f fps)", (float) job->vrate /
+        hb_log( " + video frame rate: %.3f fps -> variable fps", (float) job->vrate /
             (float) job->vrate_base );
     }
     else