Fix merge.

[dcpomatic.git] / src / lib / imagemagick_encoder.h

diff --git a/src/lib/imagemagick_encoder.h b/src/lib/imagemagick_encoder.h
index f5e97ccd82a6b1049d76c49e80d49afe25041ed4..dfc741cb2730654e5b4a42e92673217776ffaa3d 100644 (file)
--- a/src/lib/imagemagick_encoder.h
+++ b/src/lib/imagemagick_encoder.h
@@ -36,8 +36,7 @@ class ImageMagickEncoder : public Encoder
 public:
        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>);
-       void process_audio (boost::shared_ptr<const AudioBuffers>) {}
-       void process_end () {}
+private:       
+       void do_process_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+       void do_process_audio (boost::shared_ptr<AudioBuffers>) {}
 };