Move deinterleaving of audio into ffmpeg decoder.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 809f3aecdb61ce6d6cb24fd7f933ebbf4abbd7a2..b7ab9af18119cf0c1677d3c6a0993f2b48335463 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -26,11 +26,7 @@ namespace Magick {
 class ImageMagickDecoder : public Decoder
 {
 public:
-       ImageMagickDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
-
-       int length_in_frames () const {
-               return 1;
-       }
+       ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
 
        float frames_per_second () const {
                return static_frames_per_second ();
@@ -63,7 +59,7 @@ public:
        }
 
 protected:
-       bool do_pass ();
+       bool pass ();
        PixelFormat pixel_format () const;
 
        int time_base_numerator () const {