Let's try out saner b-frame init delays again.

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

diff --git a/libhb/encx264.c b/libhb/encx264.c
index c9fbffec973087c7808108bd4bd42f160ca7e710..62c98724420ff1ab8f09594ae3e5cc4a362dd4c1 100644 (file)
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -289,10 +289,8 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
             pv->init_delay = 7506;
         }
 
-        /* The delay is 2 frames for regular b-frames, 3 for b-pyramid.
-           Since job->areBframes is 1 for b-frames and 2 for b-pyramid,
-           add one to it and use it as a multiplier.                    */
-        pv->init_delay *= ( job->areBframes + 1);
+        /* The delay is 1 frames for regular b-frames, 2 for b-pyramid. */
+        pv->init_delay *= job->areBframes;
     }
 
     return 0;