Fix merge.

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 12cb5f0bdb4aeaea69ba709fb84b507fdd77fb38..53c4cc370564d8eb671564e4ccbd3ceeaebc4242 100644 (file)
--- 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 ()
                                        );