Cleanup: remove unused parameter to PlayerVideo::force.
[dcpomatic.git] / src / lib / ffmpeg_image_proxy.cc
index dd2f80e0e2a3ea5f94e0fa794fb07743645633d1..94385eabdedf5fbaa8e371530bbd7c2cd0350714 100644 (file)
 
 #include "compose.hpp"
 #include "cross.h"
+#include "dcpomatic_assert.h"
 #include "dcpomatic_socket.h"
 #include "exceptions.h"
 #include "ffmpeg_image_proxy.h"
 #include "image.h"
-#include "util.h"
+#include "memory_util.h"
 #include "warnings.h"
 #include <dcp/raw_convert.h>
 DCPOMATIC_DISABLE_WARNINGS
@@ -122,7 +123,7 @@ FFmpegImageProxy::avio_seek (int64_t const pos, int whence)
 
 
 ImageProxy::Result
-FFmpegImageProxy::image (bool aligned, optional<dcp::Size>) const
+FFmpegImageProxy::image (Image::Alignment alignment, optional<dcp::Size>) const
 {
        auto constexpr name_for_errors = "FFmpegImageProxy::image";
 
@@ -205,7 +206,7 @@ FFmpegImageProxy::image (bool aligned, optional<dcp::Size>) const
                throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path);
        }
 
-       _image = make_shared<Image>(frame, aligned);
+       _image = make_shared<Image>(frame, alignment);
 
        av_packet_unref (&packet);
        av_frame_free (&frame);