From bccc426dd0924bf6be63000835d7c86fd390ff59 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 12 Oct 2015 11:25:53 +0100
Subject: [PATCH] Fix merge.

---
 src/lib/writer.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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