Merge 1.0-seek and subtitle-content.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index c7500243e..63b4c58e3 100644
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -34,14 +34,13 @@ public:
 		return _image_content;
 	}
 
-	/* Decoder */
-
-	void pass ();
-	void seek (VideoContent::Frame, bool);
-	bool done () const;
+	void seek (ContentTime, bool);
 
 private:
+	bool pass ();
+	
 	boost::shared_ptr<const ImageContent> _image_content;
 	boost::shared_ptr<Image> _image;
+	VideoFrame _video_position;
 };