From 04ef57589ebb7c0de3377172a03b24698fd2364a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Mar 2014 14:24:08 +0000 Subject: Tentative support for 3D from alternate frames. Also remove references to libpostproc. Requested-by: Jean-Jacques Mantello --- src/lib/ffmpeg_content.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/ffmpeg_content.cc') diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index fadeec9cd..b7551c96a 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -239,7 +239,7 @@ FFmpegContent::information () const stringstream s; - s << String::compose (_("%1 frames; %2 frames per second"), video_length(), video_frame_rate()) << "\n"; + s << String::compose (_("%1 frames; %2 frames per second"), video_length_after_3d_combine(), video_frame_rate()) << "\n"; s << VideoContent::information (); return s.str (); @@ -272,7 +272,7 @@ FFmpegContent::audio_length () const { int const cafr = content_audio_frame_rate (); int const vfr = video_frame_rate (); - VideoContent::Frame const vl = video_length (); + VideoContent::Frame const vl = video_length_after_3d_combine (); boost::mutex::scoped_lock lm (_mutex); if (!_audio_stream) { @@ -429,7 +429,7 @@ FFmpegContent::full_length () const assert (film); FrameRateConversion frc (video_frame_rate (), film->video_frame_rate ()); - return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate (); + return video_length_after_3d_combine() * frc.factor() * TIME_HZ / film->video_frame_rate (); } AudioMapping -- cgit v1.2.3