summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2015-10-17 15:36:57 -0700
committerJohn Stebbins <[email protected]>2015-11-12 10:08:25 -0800
commitf1b9a4a9f7088f7ba0ca118bd1339aa76171f6c2 (patch)
tree939a45cc8d19633345f91f14090fe12fcb505dd7
parent2c9d144740e0133cdf389ec814626439700b64f7 (diff)
x265: macui multilib support
-rw-r--r--macosx/HBJob+HBJobConversion.m2
-rw-r--r--macosx/HBVideo+UIAdditions.m2
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/HBJob+HBJobConversion.m b/macosx/HBJob+HBJobConversion.m
index f19e3c125..78fc16229 100644
--- a/macosx/HBJob+HBJobConversion.m
+++ b/macosx/HBJob+HBJobConversion.m
@@ -110,7 +110,7 @@
}
if (self.video.twoPass && ((self.video.encoder & HB_VCODEC_X264_MASK) ||
- self.video.encoder == HB_VCODEC_X265))
+ (self.video.encoder & HB_VCODEC_X265_MASK)))
{
job->fastfirstpass = self.video.turboTwoPass;
}
diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m
index 0d6aaf1c1..1ca41ef0b 100644
--- a/macosx/HBVideo+UIAdditions.m
+++ b/macosx/HBVideo+UIAdditions.m
@@ -84,7 +84,7 @@
- (BOOL)turboTwoPassSupported
{
return ((self.encoder & HB_VCODEC_X264_MASK) ||
- self.encoder == HB_VCODEC_X265);
+ (self.encoder & HB_VCODEC_X265_MASK));
}
/**