Fix merge.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index f682941d1..97bbb0e48 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -45,7 +45,7 @@ public:
 
 	void set_progress () const;
 	
-	SourceFrame video_frame () const {
+	int video_frame () const {
 		return _video_frame;
 	}
 
@@ -57,15 +57,15 @@ public:
 		return _subtitle_streams;
 	}
 
-	SourceFrame last_source_frame () const {
-		return _last_source_frame;
+	double last_source_time () const {
+		return _last_source_time;
 	}
 
 protected:
 	
 	virtual PixelFormat pixel_format () const = 0;
 
-	void emit_video (boost::shared_ptr<Image>, SourceFrame);
+	void emit_video (boost::shared_ptr<Image>, double);
 	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
 	void repeat_last_video ();
 
@@ -77,8 +77,8 @@ protected:
 private:
 	void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
 
-	SourceFrame _video_frame;
-	SourceFrame _last_source_frame;
+	int _video_frame;
+	double _last_source_time;
 	
 	boost::shared_ptr<TimedSubtitle> _timed_subtitle;