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.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index fd2b28d7f..99d711693 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -32,7 +32,7 @@ using boost::optional;
 VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
 	: Decoder (f)
 	, _video_frame (0)
-	, _last_source_time (0)
+	, _last_content_time (0)
 {
 
 }
@@ -88,7 +88,7 @@ VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subti
 
 	_last_image = image;
 	_last_subtitle = sub;
-	_last_source_time = t;
+	_last_content_time = t;
 }
 
 /** Set up the current subtitle.  This will be put onto frames that
-- 
cgit v1.2.3