From 7317cc104f719b594da170fec73420dcc4213ee8 Mon Sep 17 00:00:00 2001 From: jbrjake Date: Sat, 17 May 2008 22:55:41 +0000 Subject: Re-allow constant frame rates. The MacGui should probably be updated to always use title fps for VFR instead of "Same as Source" which might be 23.976, but it's taken care of in work.c now so it's purely a cosmetic thing. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1464 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/sync.c | 2 +- libhb/work.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'libhb') diff --git a/libhb/sync.c b/libhb/sync.c index d78398531..34b426f6d 100644 --- 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 6efe796db..503403edd 100644 --- 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 -- cgit v1.2.3