diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-21 12:36:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-21 12:36:17 +0000 |
| commit | e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160 (patch) | |
| tree | ab7de2b131c3543d170b167c8b93ea2113ac112e /src/lib/video_content.cc | |
| parent | 76f601f5edbdfceec91ff6f6ce4b310e0d3a6ce9 (diff) | |
| parent | 4ec7a8070dfcda1fa327df6378eaab754f119f1b (diff) | |
Mostly-merge master.
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index b6a2d0318..5864342a2 100644 --- 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); |