summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-04 13:10:28 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-04 13:10:28 +0100
commit4a74ca2cb973585122e84c21ff48ff4ff1ebd488 (patch)
treee73cc4ef0850326f1f45037b0c22ab00a0f94685 /src/lib/ffmpeg_content.cc
parent418f17235e05d5f8c449e848c6a81e1b9017bd8a (diff)
Back-port v2's rename and slight extension of FrameRateConversion.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc3
1 files changed, 2 insertions, 1 deletions
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<const Film> 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 ();
}