diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-05-20 00:25:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-05-20 00:25:13 +0100 |
| commit | 5bcbd6821a6ff1419f9069cf9e1a94c8557a992c (patch) | |
| tree | 47715c0bcc437e02e5aa4f9075e6a10584626cd1 /src | |
| parent | 12a08dac470bed8e9a1d964d0f90785cf244aff9 (diff) | |
| parent | 4f8195575812f1d563b0ee1e480be5c7f248ce42 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/reel_writer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index d05e3901e..da79dfc04 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -361,7 +361,7 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count); DCPOMATIC_ASSERT (reel_picture_asset); - DCPOMATIC_ASSERT (reel_picture_asset->intrinsic_duration() == _period.duration().frames_round (_film->video_frame_rate ())); + DCPOMATIC_ASSERT (reel_picture_asset->duration() == _period.duration().frames_round (_film->video_frame_rate ())); reel->add (reel_picture_asset); /* If we have a hash for this asset in the CPL, assume that it is correct */ @@ -389,7 +389,7 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr } DCPOMATIC_ASSERT (reel_sound_asset); - DCPOMATIC_ASSERT (reel_sound_asset->intrinsic_duration() == _period.duration().frames_round (_film->video_frame_rate ())); + DCPOMATIC_ASSERT (reel_sound_asset->duration() == _period.duration().frames_round (_film->video_frame_rate ())); reel->add (reel_sound_asset); shared_ptr<dcp::ReelSubtitleAsset> reel_subtitle_asset; @@ -457,7 +457,7 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr } if (reel_subtitle_asset) { - DCPOMATIC_ASSERT (reel_subtitle_asset->intrinsic_duration() == _period.duration().frames_round (_film->video_frame_rate ())); + DCPOMATIC_ASSERT (reel_subtitle_asset->duration() == _period.duration().frames_round (_film->video_frame_rate ())); reel->add (reel_subtitle_asset); } |