From: jstebbins <jstebbins.hb@gmail.com>
Date: Thu, 14 May 2015 15:14:39 +0000 (+0000)
Subject: cli: fix --height
X-Git-Tag: 1.0.0~1179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90cafad3e4c610b8b009769f922fabc283979231;p=handbrake

cli: fix --height

Didn't set the proper flag to make hb_set_anamorphic_size prefer keeping
the height over the width.


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

diff --git a/libhb/preset.c b/libhb/preset.c
index c49073cf4..97a647214 100644
--- a/libhb/preset.c
+++ b/libhb/preset.c
@@ -968,13 +968,23 @@ hb_dict_t* hb_preset_job_init(hb_handle_t *h, int title_index, hb_dict_t *preset
     int width = hb_value_get_int(hb_dict_get(preset, "PictureForceWidth"));
     int height = hb_value_get_int(hb_dict_get(preset, "PictureForceHeight"));
     if (width > 0)
+    {
         geo.geometry.width = width;
+        geo.keep |= HB_KEEP_WIDTH;
+    }
     else
+    {
         geo.geometry.width -= geo.crop[2] + geo.crop[3];
+    }
     if (height > 0)
+    {
         geo.geometry.height = height;
+        geo.keep |= HB_KEEP_HEIGHT;
+    }
     else
+    {
         geo.geometry.height -= geo.crop[0] + geo.crop[1];
+    }
     if (geo.mode == HB_ANAMORPHIC_CUSTOM && !keep_aspect)
     {
         int dar_width;