X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=f249a1c35da1bf47ce53545fccf1311eed0aa79c;hb=19f94521139aac13ef8fb4eaa55855b2ada307b4;hp=463722778d1fafb867044b9fc2ac05e2cd4c6737;hpb=0a2d40420813403a96352c6dc895d23fcd9994c0;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 463722778..f249a1c35 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -296,7 +296,7 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b)
 DCPTime
 FFmpegContent::full_length () const
 {
-	FrameRateChange const frc (video->frame_rate (), film()->video_frame_rate ());
+	FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ());
 	return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
 }
 
@@ -499,14 +499,6 @@ FFmpegContent::signal_subtitle_stream_changed ()
 	signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
 }
 
-void
-FFmpegContent::changed (int property)
-{
-	if (property == VideoContentProperty::FRAME_RATE && subtitle) {
-		subtitle->set_video_frame_rate (video->frame_rate ());
-	}
-}
-
 vector<shared_ptr<FFmpegAudioStream> >
 FFmpegContent::ffmpeg_audio_streams () const
 {