summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video_frame.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-01 21:35:41 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-01 21:35:41 +0000
commit6a516da9a403ce05b2b78b3cf1376f4dfe4be3fe (patch)
tree7c5307ceefa5a6fc6a11d39bbfb2deca0e29758d /src/lib/dcp_video_frame.cc
parentdd7cf1ef6e860243b80f4c47a99393244f63a3d5 (diff)
Make film hold its DCP frame rate.
Diffstat (limited to 'src/lib/dcp_video_frame.cc')
-rw-r--r--src/lib/dcp_video_frame.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 098d222cd..67617c63c 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -80,7 +80,7 @@ using libdcp::Size;
DCPVideoFrame::DCPVideoFrame (
shared_ptr<const Image> yuv, shared_ptr<Subtitle> sub,
Size out, int p, int subtitle_offset, float subtitle_scale,
- Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l
+ Scaler const * s, int f, int dcp_fps, string pp, int clut, int bw, Log* l
)
: _input (yuv)
, _subtitle (sub)
@@ -90,7 +90,7 @@ DCPVideoFrame::DCPVideoFrame (
, _subtitle_scale (subtitle_scale)
, _scaler (s)
, _frame (f)
- , _frames_per_second (DCPFrameRate(fps).frames_per_second)
+ , _frames_per_second (dcp_fps)
, _post_process (pp)
, _colour_lut (clut)
, _j2k_bandwidth (bw)