summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-14 12:35:20 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-14 12:35:20 +0100
commita30b789020ae356d8e15c6943ae5706b83df5b84 (patch)
tree949c11d6f2433fd2626538b0bfc0f5c503b6a71e
parent3b74655a04bdac7d8fa0258225a9d3bedd170170 (diff)
Use edit rate not frame rate for displaying rate of DCPs.
-rw-r--r--ChangeLog3
-rw-r--r--src/lib/dcp_examiner.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e564e7a8f..99ec8dadf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2016-06-14 c.hetherington <cth@carlh.net>
+ * Fix incorrectly-reported frame rate when importing
+ 3D DCPs.
+
* Select correct video frame type when importing DCPs (part of #806).
2016-06-13 Carl Hetherington <cth@carlh.net>
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index e3b0fb6ee..06bef4c3a 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -73,7 +73,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
for (list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin(); i != reels.end(); ++i) {
if ((*i)->main_picture ()) {
- dcp::Fraction const frac = (*i)->main_picture()->frame_rate ();
+ dcp::Fraction const frac = (*i)->main_picture()->edit_rate ();
float const fr = float(frac.numerator) / frac.denominator;
if (!_video_frame_rate) {
_video_frame_rate = fr;