From 4a74ca2cb973585122e84c21ff48ff4ff1ebd488 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Jun 2014 13:10:28 +0100 Subject: Back-port v2's rename and slight extension of FrameRateConversion. --- src/lib/ffmpeg_content.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg_content.cc') diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 4ea6dbc6a..4d886a6dd 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -31,6 +31,7 @@ extern "C" { #include "film.h" #include "log.h" #include "exceptions.h" +#include "frame_rate_change.h" #include "i18n.h" @@ -407,7 +408,7 @@ FFmpegContent::full_length () const shared_ptr film = _film.lock (); assert (film); - FrameRateConversion frc (video_frame_rate (), film->video_frame_rate ()); + FrameRateChange frc (video_frame_rate (), film->video_frame_rate ()); return video_length_after_3d_combine() * frc.factor() * TIME_HZ / film->video_frame_rate (); } -- cgit v1.2.3