From b66010a281acd3e3e58ef7202bce55023fc29d7f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 9 Apr 2013 23:43:00 +0100
Subject: Merge ImageMagick and FFmpeg content into VideoContent list; remove
 seek_to_last hacks.

---
 src/lib/video_decoder.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/video_decoder.h')

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c04874342..05cf99a96 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -48,8 +48,8 @@ public:
 		return _video_frame;
 	}
 
-	double last_source_time () const {
-		return _last_source_time;
+	double last_content_time () const {
+		return _last_content_time;
 	}
 
 protected:
@@ -65,7 +65,7 @@ private:
 	void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
 
 	int _video_frame;
-	double _last_source_time;
+	double _last_content_time;
 	
 	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
 
-- 
cgit v1.2.3