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/decoder.cc | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index c40446919..082ad5076 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -41,7 +41,7 @@ Decoder::Decoder (shared_ptr<const Film> f)
 	_film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
 }
 
-/** Seek to a position as a source timestamp in seconds.
+/** Seek to a position as a content timestamp in seconds.
  *  @return true on error.
  */
 bool
@@ -49,12 +49,3 @@ Decoder::seek (double)
 {
 	throw DecodeError (N_("decoder does not support seek"));
 }
-
-/** Seek so that the next frame we will produce is the same as the last one.
- *  @return true on error.
- */
-bool
-Decoder::seek_to_last ()
-{
-	throw DecodeError (N_("decoder does not support seek"));
-}
-- 
cgit v1.2.3