projects
/
handbrake
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
33f1191
)
MacGui: fix a case where deinterlace filter would be enabled even if decomb was selected.
author
ritsuka
<damiog@gmail.com>
Wed, 7 Jan 2015 08:25:32 +0000
(08:25 +0000)
committer
ritsuka
<damiog@gmail.com>
Wed, 7 Jan 2015 08:25:32 +0000
(08:25 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6695
b64f7644
-9d1e-0410-96f1-
a4d463321fa5
macosx/HBJob.m
patch
|
blob
|
history
diff --git
a/macosx/HBJob.m
b/macosx/HBJob.m
index 1ae0954e9aedd4e4611f3cfee1dee2983cd4577d..7847731d4b97a6f67b3438cdfdd0a1fff64c7c0d 100644
(file)
--- a/
macosx/HBJob.m
+++ b/
macosx/HBJob.m
@@
-576,7
+576,7
@@
NSString *keyContainerTag = @"keyContainerTag";
hb_add_filter(job, filter, "455");
}
}
- else if (self.filters.deinterlace)
+ else if (
!self.filters.useDecomb &&
self.filters.deinterlace)
{
// Deinterlace
filter = hb_filter_init(HB_FILTER_DEINTERLACE);