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/image_content.cc | |
| parent | 76f601f5edbdfceec91ff6f6ce4b310e0d3a6ce9 (diff) | |
| parent | 4ec7a8070dfcda1fa327df6378eaab754f119f1b (diff) | |
Mostly-merge master.
Diffstat (limited to 'src/lib/image_content.cc')
| -rw-r--r-- | src/lib/image_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 6a37f3067..d7b37a835 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -125,7 +125,7 @@ ImageContent::full_length () const { shared_ptr<const Film> film = _film.lock (); assert (film); - return DCPTime (video_length(), FrameRateChange (video_frame_rate(), film->video_frame_rate())); + return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate())); } string |