From bd8fa9a370f1739952c83107352baa08c79d095e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 24 Oct 2012 18:14:10 +0100
Subject: Merge FilmState / Film.

---
 src/lib/ffmpeg_decoder.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.h')

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 26b5d6979..abcdfa0b2 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -42,7 +42,6 @@ struct AVBufferContext;
 struct AVCodec;
 struct AVStream;
 class Job;
-class FilmState;
 class Options;
 class Image;
 class Log;
@@ -53,7 +52,7 @@ class Log;
 class FFmpegDecoder : public Decoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+	FFmpegDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool, bool);
 	~FFmpegDecoder ();
 
 	/* Methods to query our input video */
-- 
cgit v1.2.3