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/player.cc | |
| parent | 418f17235e05d5f8c449e848c6a81e1b9017bd8a (diff) | |
Back-port v2's rename and slight extension of FrameRateConversion.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 68df8ea70..20cea7e4a 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -36,6 +36,7 @@ #include "log.h" #include "scaler.h" #include "player_video_frame.h" +#include "frame_rate_change.h" #define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); @@ -201,7 +202,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const ImageProxy> shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content); assert (content); - FrameRateConversion frc (content->video_frame_rate(), _film->video_frame_rate()); + FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate()); if (frc.skip && (frame % 2) == 1) { return; } |