projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into plot-audio
[dcpomatic.git]
/
src
/
lib
/
matcher.h
diff --git
a/src/lib/matcher.h
b/src/lib/matcher.h
index 9bd30fe620bef802284a7ba06faf93cddc380589..60bb8743226078628adfb7246fe2a3922c83a7b3 100644
(file)
--- a/
src/lib/matcher.h
+++ b/
src/lib/matcher.h
@@
-19,6
+19,7
@@
#include <boost/optional.hpp>
#include "processor.h"
#include <boost/optional.hpp>
#include "processor.h"
+#include "ffmpeg_compatibility.h"
class Matcher : public AudioVideoProcessor
{
class Matcher : public AudioVideoProcessor
{
@@
-34,6
+35,6
@@
private:
int _video_frames;
int64_t _audio_frames;
boost::optional<AVPixelFormat> _pixel_format;
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;
};
boost::optional<int> _channels;
};