Give Film a container; move crop into video content; other bits.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index dd18ad64ed03e94957343f8105ca34eb0353a658..c6b19b742bf72a9037842d2ff02b6b9891eece43 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -34,7 +34,7 @@ using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
        : Decoder (f)
-       , VideoDecoder (f)
+       , VideoDecoder (f, c)
        , _imagemagick_content (c)
        , _position (0)
 {
@@ -92,7 +92,7 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       _image = _image->crop (_film->crop(), true);
+       _image = _image->crop (_imagemagick_content->crop(), true);
        emit_video (_image, false, double (_position) / 24);
 
        ++_position;