Merge ImageMagick and FFmpeg content into VideoContent list; remove seek_to_last hacks.

1 files changed, 3 insertions, 3 deletions

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;