Merge master.

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

diff --git a/src/lib/matcher.h b/src/lib/matcher.h
index 03efd5cc0f8092f9496509569985272f60efcc2e..60bb8743226078628adfb7246fe2a3922c83a7b3 100644 (file)
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@ -19,12 +19,13 @@
 
 #include <boost/optional.hpp>
 #include "processor.h"
+#include "ffmpeg_compatibility.h"
 
 class Matcher : public AudioVideoProcessor
 {
 public:
        Matcher (Log* log, int sample_rate, float frames_per_second);
-       void process_video (boost::shared_ptr<Image> i, boost::shared_ptr<Subtitle> s);
+       void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s);
        void process_audio (boost::shared_ptr<AudioBuffers>);
        void process_end ();
 
@@ -34,6 +35,6 @@ private:
        int _video_frames;
        int64_t _audio_frames;
        boost::optional<AVPixelFormat> _pixel_format;
-       boost::optional<Size> _size;
+       boost::optional<libdcp::Size> _size;
        boost::optional<int> _channels;
 };