diff options
| author | jbrjake <[email protected]> | 2007-08-19 04:22:36 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2007-08-19 04:22:36 +0000 |
| commit | ff1e35b02cb6d5be6c1a45bf2ab1af89fc1c951f (patch) | |
| tree | ddec9b019efbc3ff88785b363e0ac16aceccfb81 | |
| parent | 622d4cddab077306724f4ce7cbfb2661b77dbc0d (diff) | |
CLI/MacGui: removes weightb=0 from the turbo option string, because it was causing frame count differences for the 2nd pass. Also removes a stray colon from the Broke preset.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@832 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | macosx/Controller.mm | 4 | ||||
| -rw-r--r-- | test/test.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index efe815090..54bd924ba 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -1375,7 +1375,7 @@ list = hb_get_titles( fHandle ); 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:weightb=0: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"; /* append the "Turbo" string variable to the existing opts string. Note: the "Turbo" string must be appended, not prepended to work properly*/ NSString *firstPassOptStringCombined = [[fDisplayX264Options stringValue] stringByAppendingString:firstPassOptStringTurbo]; @@ -4775,7 +4775,7 @@ the user is using "Custom" settings by determining the sender*/ /* Video encoder */ [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"]; /* x264 Option String */ - [preset setObject:@"ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:b-pyramid::direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip" forKey:@"x264Option"]; + [preset setObject:@"ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip" forKey:@"x264Option"]; /* Video quality */ [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoQualityType"]; [preset setObject:@"695" forKey:@"VideoTargetSize"]; diff --git a/test/test.c b/test/test.c index b4f68901f..4bdc87a9c 100644 --- a/test/test.c +++ b/test/test.c @@ -62,7 +62,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:weightb=0: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"; static int largeFileSize = 0; /* Exit cleanly on Ctrl-C */ |