X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fffmpeg_encoder.cc;h=61ca1ae008bc47fa99c92178ec5a863be0ef28be;hb=037b18b34e3e3fd9b9e692d85f35de17ab67aff8;hp=fc0d5eab26350f8ee6d257043b9ff2da12a64bf4;hpb=0a1aa72f11b7d5109caaa5d3ae0068e18dea6b56;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index fc0d5eab2..61ca1ae00 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -183,7 +183,7 @@ FFmpegEncoder::go ()
 			}
 			auto fe = encoder->get (v.first->eyes());
 			if (fe) {
-				fe->video(v.first, v.second);
+				fe->video(v.first, v.second - reel->from);
 			}
 		}
 
@@ -273,11 +273,11 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
 			eyes = Eyes::BOTH;
 		} else if (eyes == Eyes::RIGHT) {
 			/* ...and ignore the right eye.*/
-			return shared_ptr<FFmpegFileEncoder>();
+			return {};
 		}
 	}
 
-	map<Eyes, std::shared_ptr<FFmpegFileEncoder> >::const_iterator i = _encoders.find (eyes);
+	auto i = _encoders.find (eyes);
 	DCPOMATIC_ASSERT (i != _encoders.end());
 	return i->second;
 }