diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-12 11:25:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-12 11:25:53 +0100 |
| commit | bccc426dd0924bf6be63000835d7c86fd390ff59 (patch) | |
| tree | 8b2f40c41a0d931af8f5dc25198c7f483329d430 /src | |
| parent | 6bc2f68acc12f254d298a41dc9656306c3ae8c4f (diff) | |
Fix merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/writer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 12cb5f0bd..53c4cc370 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -650,7 +650,7 @@ Writer::finish () /* All our assets should be the same length; use the picture asset length here as a reference to set the subtitle one. */ - dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(_subtitle_asset)->set_intrinsic_duration ( + dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(i.subtitle_asset)->set_intrinsic_duration ( reel_picture_asset->intrinsic_duration () ); |