diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
| commit | bd8fa9a370f1739952c83107352baa08c79d095e (patch) | |
| tree | dafa3dae2db5439dc08e770fc4b09febac5f0374 /src/lib/ffmpeg_decoder.h | |
| parent | 44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff) | |
Merge FilmState / Film.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 */ |