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/imagemagick_encoder.h | |
| parent | 44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff) | |
Merge FilmState / Film.
Diffstat (limited to 'src/lib/imagemagick_encoder.h')
| -rw-r--r-- | src/lib/imagemagick_encoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/imagemagick_encoder.h b/src/lib/imagemagick_encoder.h index 29767ed03..f5e97ccd8 100644 --- a/src/lib/imagemagick_encoder.h +++ b/src/lib/imagemagick_encoder.h @@ -34,7 +34,7 @@ class Log; class ImageMagickEncoder : public Encoder { public: - ImageMagickEncoder (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l); + ImageMagickEncoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const Options> o); void process_begin (int64_t audio_channel_layout) {} void process_video (boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle>); |