summaryrefslogtreecommitdiffstats
path: root/macosx/Controller.mm
diff options
context:
space:
mode:
authordynaflash <[email protected]>2007-08-14 05:15:09 +0000
committerdynaflash <[email protected]>2007-08-14 05:15:09 +0000
commit58e776aabee41988c3762e4cab191d8486f0b833 (patch)
tree68a5ac46307ab01f4fad91c26ecefbe93de9ca42 /macosx/Controller.mm
parent1f80a3c4783e1562cb770fc971643fb348c1b099 (diff)
MacGui: Add height check for keep aspect ratio on when selecting a preset.
- Patch courtesy of BradleyS, Thanks! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@807 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.mm')
-rw-r--r--macosx/Controller.mm10
1 files changed, 10 insertions, 0 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 5f3876260..fc1ce3737 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -5100,6 +5100,11 @@ the user is using "Custom" settings by determining the sender*/
if (job->keep_ratio == 1)
{
hb_fix_aspect( job, HB_KEEP_WIDTH );
+ if( job->height > fTitle->height )
+ {
+ job->height = fTitle->height;
+ hb_fix_aspect( job, HB_KEEP_HEIGHT );
+ }
}
job->pixel_ratio = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
}
@@ -5111,6 +5116,11 @@ the user is using "Custom" settings by determining the sender*/
if (job->keep_ratio == 1)
{
hb_fix_aspect( job, HB_KEEP_WIDTH );
+ if( job->height > fTitle->height )
+ {
+ job->height = fTitle->height;
+ hb_fix_aspect( job, HB_KEEP_HEIGHT );
+ }
}
job->pixel_ratio = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
[fPicSettingDeinterlace setStringValue: [NSString stringWithFormat: @"%d",[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]]];