summaryrefslogtreecommitdiff
path: root/src/lib/video_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-08 10:03:58 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-08 10:03:58 +0100
commit4a4ba8509f62a325d1074ec488b97b00922c6fc5 (patch)
tree003238eebf758b4b3f791424c331fda622152ccd /src/lib/video_content.h
parent1ffc5c24b2e1248e95b746100bb5c31fab360f25 (diff)
Conversion of frame index to FFmpeg time must always use the original or detected FFmpeg video frame rate.
Diffstat (limited to 'src/lib/video_content.h')
-rw-r--r--src/lib/video_content.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index d0b907cb8..62459222d 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -115,6 +115,11 @@ public:
return _video_frame_rate;
}
+ float original_video_frame_rate () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _original_video_frame_rate;
+ }
+
void set_video_frame_type (VideoFrameType);
void set_video_frame_rate (float);
@@ -179,6 +184,7 @@ protected:
void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
VideoContent::Frame _video_length;
+ float _original_video_frame_rate;
float _video_frame_rate;
private: