summaryrefslogtreecommitdiff
path: root/src/lib/imagemagick_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-24 18:14:10 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-24 18:14:10 +0100
commitbd8fa9a370f1739952c83107352baa08c79d095e (patch)
treedafa3dae2db5439dc08e770fc4b09febac5f0374 /src/lib/imagemagick_decoder.h
parent44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff)
Merge FilmState / Film.
Diffstat (limited to 'src/lib/imagemagick_decoder.h')
-rw-r--r--src/lib/imagemagick_decoder.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 3e58e645f..13b53b685 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -26,7 +26,7 @@ namespace Magick {
class ImageMagickDecoder : public Decoder
{
public:
- ImageMagickDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+ ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool, bool);
float frames_per_second () const {
return static_frames_per_second ();