diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-04 13:10:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-04 13:10:28 +0100 |
| commit | 4a74ca2cb973585122e84c21ff48ff4ff1ebd488 (patch) | |
| tree | e73cc4ef0850326f1f45037b0c22ab00a0f94685 /src/lib/video_content.cc | |
| parent | 418f17235e05d5f8c449e848c6a81e1b9017bd8a (diff) | |
Back-port v2's rename and slight extension of FrameRateConversion.
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 40772980f..ec5890b45 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -30,6 +30,7 @@ #include "util.h" #include "film.h" #include "exceptions.h" +#include "frame_rate_change.h" #include "i18n.h" @@ -367,7 +368,7 @@ VideoContent::time_to_content_video_frames (Time t) 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()); /* Here we are converting from time (in the DCP) to a frame number in the content. Hence we need to use the DCP's frame rate and the double/skip correction, not |