diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-28 23:42:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-28 23:42:52 +0100 |
| commit | 3ff75a6e082c03f9b3c86693c864fd0959bdcee1 (patch) | |
| tree | b083ab207e007736dc65b65c09123b63bebeaa7e | |
| parent | 2afb43b58a84b76cf592931ee30a8cdccf88d7ae (diff) | |
Yet more libdcp-related build fixes.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/dcp_decoder.h | 6 | ||||
| -rw-r--r-- | src/lib/video_mxf_decoder.h | 7 |
3 files changed, 6 insertions, 9 deletions
@@ -233,7 +233,7 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', '5ff3c5a'), + ('libdcp', 'b602b9e'), ('libsub', '3db5052')) def configure_options(target): diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 6e1f95356..b1b26056b 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -24,12 +24,12 @@ #include "decoder.h" #include "dcp.h" +#include <dcp/mono_picture_asset_reader.h> +#include <dcp/stereo_picture_asset_reader.h> +#include <dcp/sound_asset_reader.h> namespace dcp { class Reel; - class MonoPictureAssetReader; - class StereoPictureAssetReader; - class SoundAssetReader; } class DCPContent; diff --git a/src/lib/video_mxf_decoder.h b/src/lib/video_mxf_decoder.h index 34388ac82..330d59ed8 100644 --- a/src/lib/video_mxf_decoder.h +++ b/src/lib/video_mxf_decoder.h @@ -19,11 +19,8 @@ */ #include "decoder.h" - -namespace dcp { - class MonoPictureAssetReader; - class StereoPictureAssetReader; -} +#include <dcp/mono_picture_asset_reader.h> +#include <dcp/stereo_picture_asset_reader.h> class VideoMXFContent; class Log; |
