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

1 files changed, 1 insertions, 10 deletions

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"));
-}