Fix incorrect alpha channel scaling with RGBA64.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 9d69f743a33d6c08d3efae5af36329a4278cb709..f6ee17425b6d77b48d6b074c5d369f6cfbd888c3 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -28,11 +28,10 @@
 #define DCPOMATIC_VIDEO_DECODER_H
 
 
-#include "decoder.h"
-#include "video_content.h"
-#include "util.h"
 #include "content_video.h"
+#include "decoder.h"
 #include "decoder_part.h"
+#include "video_content.h"
 #include <boost/signals2.hpp>
 
 
@@ -56,11 +55,11 @@ public:
        friend struct ffmpeg_pts_offset_test;
        friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-       boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const {
+       boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override {
                return _position;
        }
 
-       void seek ();
+       void seek () override;
        void emit (std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, Frame frame);
 
        boost::signals2::signal<void (ContentVideo)> Data;