summaryrefslogtreecommitdiffstats
path: root/libhb/encx264.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-03-13 21:51:14 +0000
committerjstebbins <[email protected]>2011-03-13 21:51:14 +0000
commit9d05a2b4756b2bbffac60eb50fc98e6cb1f4f9f0 (patch)
treea9f15a7749f49a8cb5e610b47343026f0436797b /libhb/encx264.c
parent1e6f3e13c431598ea8338fa19dd0f2504e2b3ef5 (diff)
fix 2 pass cfr x264 crash
An error in interjob->vrate calculation lead to specifying a different timebase for the 1st and 2nd pass which x264 does not allow. This improves the interjob->vrate calculation accuracy and also guarantees the timebase is the same on both passes regardless of the calculations accuracy. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3848 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/encx264.c')
-rw-r--r--libhb/encx264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libhb/encx264.c b/libhb/encx264.c
index 67ea45b1a..ed76a1f70 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -98,7 +98,7 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
param.i_threads = ( hb_get_cpu_count() * 3 / 2 );
param.i_width = job->width;
param.i_height = job->height;
- if( job->pass == 2 )
+ if( job->pass == 2 && job->cfr != 1 )
{
hb_interjob_t * interjob = hb_interjob_get( job->h );
param.i_fps_num = interjob->vrate;