summaryrefslogtreecommitdiffstats
path: root/macosx/HBJob+HBJobConversion.m
diff options
context:
space:
mode:
authorRodeo <[email protected]>2015-05-29 22:20:35 +0000
committerRodeo <[email protected]>2015-05-29 22:20:35 +0000
commit93fb333304b2493a50623b04caac95b53eca3240 (patch)
tree6770a27513b3c5f1d8a5231cfad9692d3fcd7329 /macosx/HBJob+HBJobConversion.m
parent1538772d963815afb194a80fe73e751d75badb99 (diff)
MacGui: don't hardcode which encoders support the preset system.
Just ask libhb instead. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7243 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HBJob+HBJobConversion.m')
-rw-r--r--macosx/HBJob+HBJobConversion.m14
1 files changed, 7 insertions, 7 deletions
diff --git a/macosx/HBJob+HBJobConversion.m b/macosx/HBJob+HBJobConversion.m
index 4f0288921..8a0836b2e 100644
--- a/macosx/HBJob+HBJobConversion.m
+++ b/macosx/HBJob+HBJobConversion.m
@@ -104,15 +104,15 @@
job->ipod_atom = self.mp4iPodCompatible;
}
- job->twopass = self.video.twoPass;
- if (job->vcodec == HB_VCODEC_X264 || job->vcodec == HB_VCODEC_X265)
+ if (self.video.twoPass && (self.video.encoder == HB_VCODEC_X264 ||
+ self.video.encoder == HB_VCODEC_X265))
{
- // set fastfirstpass if 2-pass and Turbo are enabled
- if (self.video.twoPass)
- {
- job->fastfirstpass = self.video.turboTwoPass;
- }
+ job->fastfirstpass = self.video.turboTwoPass;
+ }
+ job->twopass = self.video.twoPass;
+ if (hb_video_encoder_get_presets(self.video.encoder) != NULL)
+ {
// advanced x264/x265 options
NSString *tmpString;
// translate zero-length strings to NULL for libhb