X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=86ce7503c9483c192e78c1655c99391f0ba68d36;hp=90c00283d940fc79c43f1e0cc3131ae92507e01b;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hpb=76f601f5edbdfceec91ff6f6ce4b310e0d3a6ce9

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 90c00283d..86ce7503c 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -237,7 +237,7 @@ FFmpegContent::information () const
 	
 	stringstream s;
 	
-	s << String::compose (_("%1 frames; %2 frames per second"), video_length().frames (video_frame_rate()), video_frame_rate()) << "\n";
+	s << String::compose (_("%1 frames; %2 frames per second"), video_length_after_3d_combine().frames (video_frame_rate()), video_frame_rate()) << "\n";
 	s << VideoContent::information ();
 
 	return s.str ();
@@ -268,14 +268,12 @@ FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
 ContentTime
 FFmpegContent::audio_length () const
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (!_audio_stream) {
-			return ContentTime ();
-		}
+	boost::mutex::scoped_lock lm (_mutex);
+	if (!_audio_stream) {
+		return ContentTime ();
 	}
 
-	return video_length();
+	return video_length ();
 }
 
 int
@@ -422,7 +420,7 @@ FFmpegContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
-	return DCPTime (video_length(), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
+	return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
 }
 
 AudioMapping