summaryrefslogtreecommitdiff
path: root/src/lib/image_examiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-04-12 22:10:54 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-18 11:50:29 +0100
commit6f344b876689a1234a5eb75041882f06f5d9fe5c (patch)
tree3a51f17cab8b8f31b21661b643aaed6a53326031 /src/lib/image_examiner.cc
parent36774ee2b48f0bfde43b743592e5816ff58bb7d2 (diff)
Reasonably straightforward stuff; main things are adding
a _parent to VideoContent (mainly, but not only, for signalling) and moving the video shared_ptr into Content, which makes much more sense to replace dynamic_cast tests for whether something has video or whatever. Nearly builds.
Diffstat (limited to 'src/lib/image_examiner.cc')
-rw-r--r--src/lib/image_examiner.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 7b02de956..010275429 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -85,9 +85,9 @@ ImageExaminer::video_size () const
optional<double>
ImageExaminer::video_frame_rate () const
{
- if (_image_content->has_own_video_frame_rate()) {
+ if (_image_content->video->has_own_video_frame_rate()) {
/* The content already knows what frame rate it should be */
- return _image_content->video_frame_rate();
+ return _image_content->video->video_frame_rate();
}
/* Don't know */