X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=9f29a03bfbf8009ddc42a45e9a7539c5d4c6f627;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=3625e074fba0460fc63729a00bc30c446f7d769b;hpb=2537a2d959a5872c2e75b322022a7679d24c7e60;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 3625e074f..9f29a03bf 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -35,9 +35,10 @@ using std::max;
 using std::back_inserter;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
-VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared_ptr<Log> log)
-	: DecoderPart (parent, log)
+VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c)
+	: DecoderPart (parent)
 	, _content (c)
 {
 
@@ -53,7 +54,7 @@ VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared
  *  and so on.
  */
 void
-VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame)
+VideoDecoder::emit (shared_ptr<const Film> film, shared_ptr<const ImageProxy> image, Frame frame)
 {
 	if (ignore ()) {
 		return;
@@ -95,7 +96,7 @@ VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame)
 		DCPOMATIC_ASSERT (false);
 	}
 
-	_position = ContentTime::from_frames (frame, _content->active_video_frame_rate ());
+	_position = ContentTime::from_frames (frame, _content->active_video_frame_rate(film));
 }
 
 void