summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbrjake <[email protected]>2008-01-14 17:52:28 +0000
committerjbrjake <[email protected]>2008-01-14 17:52:28 +0000
commit95439c31034a1523fb9450aa1aa968588f4905ce (patch)
tree42d3ebe66cfc5d7870246fe7547596d31ab8a9a0
parent622b70b1c8edd8c09a60f130ccf19befc4efd170 (diff)
Use weightb=0 for turbo 1st pass x264 options. This prevents frame count discrepancies between passes that can lead to a crash at the end of the 2nd pass.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1194 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/Controller.mm2
-rw-r--r--test/test.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 891564230..1a6a63514 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1524,7 +1524,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
if( [fVidTwoPassCheck state] == NSOnState && [fVidTurboPassCheck state] == NSOnState )
{
/* pass the "Turbo" string to be appended to the existing x264 opts string into a variable for the first pass */
- NSString *firstPassOptStringTurbo = @":ref=1:subme=1:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0";
+ NSString *firstPassOptStringTurbo = @":ref=1:subme=1:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
/* append the "Turbo" string variable to the existing opts string.
Note: the "Turbo" string must be appended, not prepended to work properly*/
NSString *firstPassOptStringCombined = [[fAdvancedOptions optionsString] stringByAppendingString:firstPassOptStringTurbo];
diff --git a/test/test.c b/test/test.c
index 49474b788..892636981 100644
--- a/test/test.c
+++ b/test/test.c
@@ -66,7 +66,7 @@ static char *x264opts2 = NULL;
static int maxHeight = 0;
static int maxWidth = 0;
static int turbo_opts_enabled = 0;
-static char * turbo_opts = "ref=1:subme=1:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0";
+static char * turbo_opts = "ref=1:subme=1:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
static int largeFileSize = 0;
static int preset = 0;
static char * preset_name = 0;