projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v2.16.78' into v2.17.x
[dcpomatic.git]
/
src
/
lib
/
dcp_content.cc
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index 574b077a45c75a5e9fef1f0f641b6c266b4e125b..378ba18827e7ccd32b8bfe1946cfd8e8b77f2a26 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-838,7
+838,7
@@
DCPContent::kdm_timing_window_valid () const
Resolution
DCPContent::resolution () const
{
- if (video->size()
.width > 2048 || video->size().height > 1080
) {
+ if (video->size()
&& (video->size()->width > 2048 || video->size()->height > 1080)
) {
return Resolution::FOUR_K;
}