From 104bd524449537107e62df540fd5eb9f356acfd3 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Wed, 11 Nov 2009 17:32:37 +0000 Subject: [PATCH] update x264 to r1332 Default weightp to none for baseline. user can override. git-svn-id: svn://localhost/HandBrake/trunk@2922 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/x264/module.defs | 2 +- libhb/encx264.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index 35efddb8..accbb20e 100644 --- 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.m0k.org/handbrake/contrib/x264-r1318-fe83a90.tar.gz +X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1332-70f8869.tar.gz X264.EXTRACT.tarbase = x264 X264.CONFIGURE.deps = diff --git a/libhb/encx264.c b/libhb/encx264.c index 56bdd5ff..bd41839a 100644 --- a/libhb/encx264.c +++ b/libhb/encx264.c @@ -86,7 +86,7 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) x264_param_default( ¶m ); - /* Temporarily default mbtree to off for baseline, + /* Default weightp to off for baseline, overridable through x264 option strings. */ if( job->x264opts != NULL && *job->x264opts != '\0' ) { @@ -124,7 +124,7 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) { if( atoi( value ) == 0 ) { - param.rc.b_mb_tree = 0; + param.analyse.i_weighted_pred = X264_WEIGHTP_NONE; } } } -- 2.11.0