summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorritsuka <[email protected]>2014-08-21 18:11:08 +0000
committerritsuka <[email protected]>2014-08-21 18:11:08 +0000
commitc34ebc6c340f6cb472206edc96bf3b0b4dd57c84 (patch)
tree14dcd9c0ccf97329ee7be195bd5a4f489cd15881
parentb7bfda913fa95937b94254bd61294d8ccd7d8d01 (diff)
MacGui: load the old lavcOption format too is preset in the preset.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6338 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/HBVideoController.m11
1 files changed, 9 insertions, 2 deletions
diff --git a/macosx/HBVideoController.m b/macosx/HBVideoController.m
index 325145969..57720172f 100644
--- a/macosx/HBVideoController.m
+++ b/macosx/HBVideoController.m
@@ -449,8 +449,15 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
}
else
{
- // Apply the lavcOption
- self.lavcOptions = preset[@"VideoOptionExtra"];
+ if (preset[@"lavcOption"])
+ {
+ // Load the old format
+ self.lavcOptions = preset[@"lavcOption"];
+ }
+ else
+ {
+ self.lavcOptions = preset[@"VideoOptionExtra"];
+ }
}
int qualityType = [preset[@"VideoQualityType"] intValue] - 1;