Mostly-merge master.

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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index b6a2d031857ad2e9f644ebfa06b5479dcc743989..5864342a265c0fc873c302490acb3191f8f251bd 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -319,7 +319,7 @@ VideoContent::technical_summary () const
 {
        return String::compose (
                "video: length %1, size %2x%3, rate %4",
-               video_length().seconds(),
+               video_length_after_3d_combine().seconds(),
                video_size().width,
                video_size().height,
                video_frame_rate()
@@ -332,6 +332,7 @@ VideoContent::video_size_after_3d_split () const
        dcp::Size const s = video_size ();
        switch (video_frame_type ()) {
        case VIDEO_FRAME_TYPE_2D:
+       case VIDEO_FRAME_TYPE_3D_ALTERNATE:
                return s;
        case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
                return dcp::Size (s.width / 2, s.height);