From: Carl Hetherington <cth@carlh.net>
Date: Mon, 12 Oct 2015 10:25:53 +0000 (+0100)
Subject: Fix merge.
X-Git-Tag: v2.4.11~4
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=bccc426dd0924bf6be63000835d7c86fd390ff59

Fix merge.
---

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 ()
 					);