pot/merge.

[dcpomatic.git] / src / lib / writer.cc

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7792dda8e28c7655d7c1c372a3ab7116bda0980e..2e732c280277fd44938ff75482c7eaad87e8759a 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -676,8 +676,8 @@ Writer::finish (boost::filesystem::path output_dcp)
 
        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);
+               /* It's not allowed to have a zero active area width or height, and the sizes must be multiples of 2 */
+               cpl->set_main_picture_active_area({ active_area.width & ~1, active_area.height & ~1});
        }
 
        auto sl = film()->subtitle_languages().second;
@@ -801,7 +801,7 @@ Writer::can_fake_write (Frame frame) const
 
        /* Make frame relative to the start of the reel */
        frame -= reel.start ();
-       return (frame != 0 && frame < reel.first_nonexistant_frame());
+       return (frame != 0 && frame < reel.first_nonexistent_frame());
 }