diff options
| author | jbrjake <[email protected]> | 2009-12-09 18:21:16 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2009-12-09 18:21:16 +0000 |
| commit | ce62b98b2a203007e879169d91d14cb5719fa7bb (patch) | |
| tree | 0f48f2a18bf9cc74f3749bc6309c444c7992550b /libhb | |
| parent | 7498fd97c1ce80f338e8cf30b76749f90ee87461 (diff) | |
Removes obsolete check for mbtree being off before adjusting render offsets for b-pyramid. Also corrects a bit of coding style.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3018 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/encx264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/encx264.c b/libhb/encx264.c index d237d913d..84cbac8b8 100644 --- a/libhb/encx264.c +++ b/libhb/encx264.c @@ -242,12 +242,12 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) /* B-frames are on by default.*/ job->areBframes = 1; - if(!param.rc.b_mb_tree && param.i_bframe && param.i_bframe_pyramid) + if( param.i_bframe && param.i_bframe_pyramid ) { /* Note b-pyramid here, so the initial delay can be doubled */ job->areBframes = 2; } - else if (!param.i_bframe) + else if( !param.i_bframe ) { /* When B-frames are enabled, the max frame count increments @@ -259,7 +259,7 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) job->areBframes = 0; } - if (param.i_keyint_min != 25 || param.i_keyint_max != 250) + if( param.i_keyint_min != 25 || param.i_keyint_max != 250 ) hb_log("encx264: keyint-min: %i, keyint-max: %i", param.i_keyint_min, param.i_keyint_max); /* set up the VUI color model & gamma to match what the COLR atom |