MacGui: use subq for subpixel motion estimation instead of subme. This helps avoid those string-searching issues touched on in the past two commits.

This will have to be revisited when I add a "bime" option, because that will probably conflict with what dynaflash added in the last commit to sort this problem out.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 06c460f8b..4bc8cb583 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -2066,6 +2066,12 @@ the user is using "Custom" settings by determining the sender*/
         cleanOptNameString = @"no-dct-decimate";
     }
     
+    /*Subme*/
+    if ([cleanOptNameString isEqualToString:@"subme"])
+    {
+        cleanOptNameString = @"subq";
+    }
+    
     return cleanOptNameString;	
 }
 
@@ -2129,7 +2135,7 @@ the user is using "Custom" settings by determining the sender*/
                     [fX264optNodctdcmtPopUp selectItemAtIndex:[optValue intValue]+1];
                 }
                 /*Sub Me NSPopUpButton*/
-                if ([optName isEqualToString:@"subme"])
+                if ([optName isEqualToString:@"subq"])
                 {
                     [fX264optSubmePopUp selectItemAtIndex:[optValue intValue]+1];
                 }
@@ -2183,7 +2189,7 @@ the user is using "Custom" settings by determining the sender*/
     }
     if (sender == fX264optSubmePopUp)
     {
-        optNameToChange = @"subme";
+        optNameToChange = @"subq";
     }
     if (sender == fX264optTrellisPopUp)
     {