diff options
| author | dynaflash <[email protected]> | 2011-05-19 19:40:21 +0000 |
|---|---|---|
| committer | dynaflash <[email protected]> | 2011-05-19 19:40:21 +0000 |
| commit | 4da86152462698eab575dc00411e92f825bb1548 (patch) | |
| tree | 091d0beba0d32239ae4c2eccb231ff6ef70f76dd /macosx/Controller.m | |
| parent | 23c58d38703100a80179a69c688cb28fbb35cff1 (diff) | |
MacGui: Remove deprecated PictureDecombDeinterlace key.
- As per https://reviews.handbrake.fr/r/95/
- Patch by Rodeo ... as always thanks Rodeo!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3986 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.m')
| -rw-r--r-- | macosx/Controller.m | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index e9631c346..40121af1e 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -2871,15 +2871,11 @@ fWorkingCount = 0; /* Filters */ - /* We only allow *either* Decomb or Deinterlace. So check for the PictureDecombDeinterlace key. - * also, older presets may not have this key, in which case we also check to see if that preset had PictureDecomb - * specified, in which case we use decomb and ignore any possible Deinterlace settings as using both was less than - * sane. - */ + /* We only allow *either* Decomb or Deinterlace. So check for the PictureDecombDeinterlace key. */ [fPictureController setUseDecomb:1]; [fPictureController setDecomb:0]; [fPictureController setDeinterlace:0]; - if ([[queueToApply objectForKey:@"PictureDecombDeinterlace"] intValue] == 1 || [[queueToApply objectForKey:@"PictureDecomb"] intValue] > 0) + if ([[queueToApply objectForKey:@"PictureDecombDeinterlace"] intValue] == 1) { /* we are using decomb */ /* Decomb */ @@ -5692,15 +5688,11 @@ return YES; { /* Filters */ - /* We only allow *either* Decomb or Deinterlace. So check for the PictureDecombDeinterlace key. - * also, older presets may not have this key, in which case we also check to see if that preset had PictureDecomb - * specified, in which case we use decomb and ignore any possible Deinterlace settings as using both was less than - * sane. - */ + /* We only allow *either* Decomb or Deinterlace. So check for the PictureDecombDeinterlace key. */ [fPictureController setUseDecomb:1]; [fPictureController setDecomb:0]; [fPictureController setDeinterlace:0]; - if ([[chosenPreset objectForKey:@"PictureDecombDeinterlace"] intValue] == 1 || [[chosenPreset objectForKey:@"PictureDecomb"] intValue] > 0) + if ([[chosenPreset objectForKey:@"PictureDecombDeinterlace"] intValue] == 1) { /* we are using decomb */ /* Decomb */ |