projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b59d8e2
)
Don't write active picture area with zero width or height as it makes verification...
author
Carl Hetherington
<cth@carlh.net>
Sun, 21 Feb 2021 19:27:58 +0000
(20:27 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 21 Feb 2021 19:27:58 +0000
(20:27 +0100)
src/lib/writer.cc
patch
|
blob
|
history
diff --git
a/src/lib/writer.cc
b/src/lib/writer.cc
index ddb95151c4bf1fbefd665399ff16f135346fe95a..9ebdd92a3e3b2e25f6c06c1e840b81e19652a2a9 100644
(file)
--- a/
src/lib/writer.cc
+++ b/
src/lib/writer.cc
@@
-642,7
+642,12
@@
Writer::finish (boost::filesystem::path output_dcp)
cpl->set_main_sound_configuration (msc.to_string());
cpl->set_main_sound_sample_rate (film()->audio_frame_rate());
cpl->set_main_picture_stored_area (film()->frame_size());
cpl->set_main_sound_configuration (msc.to_string());
cpl->set_main_sound_sample_rate (film()->audio_frame_rate());
cpl->set_main_picture_stored_area (film()->frame_size());
- cpl->set_main_picture_active_area (film()->active_area());
+
+ auto active_area = film()->active_area();
+ if (active_area.width > 0 && active_area.height > 0) {
+ /* It's not allowed to have a zero active area width or height */
+ cpl->set_main_picture_active_area (active_area);
+ }
vector<dcp::LanguageTag> sl = film()->subtitle_languages();
if (sl.size() > 1) {
vector<dcp::LanguageTag> sl = film()->subtitle_languages();
if (sl.size() > 1) {