x264 bump from r1523 to r1538

- Accompanying changes to encx264.c to address default min-keyint in x264, encx264.c patch courtesy of Rodeo.

git-svn-id: svn://localhost/HandBrake/trunk@3225 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index b7c95ab..b343adc 100644 (file)
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,X264,x264,PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1523-25ca5b0.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1538-bd72d46.tar.gz
 X264.EXTRACT.tarbase = x264
 
 X264.CONFIGURE.deps   =

diff --git a/libhb/encx264.c b/libhb/encx264.c
index b74d4f2..91b53f7 100644 (file)
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -124,7 +124,7 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
     }
     
     /* Temporary hack to use old b-pyramid default */
-    param.i_bframe_pyramid = 0;
+    param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
 
     /* Enable metrics */
     param.analyse.b_psnr = 1;
@@ -161,14 +161,12 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
                we still want the same keyframe intervals as the 1st pass,
                so the 1st pass stats won't conflict on frame decisions.    */
             hb_interjob_t * interjob = hb_interjob_get( job->h );
-            param.i_keyint_min =      ( ( (double)interjob->vrate / (double)interjob->vrate_base ) + 0.5 );
             param.i_keyint_max = ( ( 10 * (double)interjob->vrate / (double)interjob->vrate_base ) + 0.5 );
         }
         else
         {
             /* adjust +0.5 for when fps has remainder to bump
                { 23.976, 29.976, 59.94 } to { 24, 30, 60 } */
-            param.i_keyint_min =      ( ( (double)job->vrate / (double)job->vrate_base ) + 0.5 );
             param.i_keyint_max = ( ( 10 * (double)job->vrate / (double)job->vrate_base ) + 0.5 );
         }
     }
@@ -267,8 +265,9 @@ 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 )
-        hb_log("encx264: keyint-min: %i, keyint-max: %i", param.i_keyint_min, param.i_keyint_max);
+    if( param.i_keyint_min != X264_KEYINT_MIN_AUTO || param.i_keyint_max != 250 )
+        hb_log("encx264: min-keyint: %i, keyint: %i", param.i_keyint_min == X264_KEYINT_MIN_AUTO ? param.i_keyint_max / 10 : param.i_keyint_min,
+                                                      param.i_keyint_max);
 
     /* set up the VUI color model & gamma to match what the COLR atom
      * set in muxmp4.c says. See libhb/muxmp4.c for notes. */