Yet more libdcp-related build fixes.

diff --git a/cscript b/cscript
index f2fe15745136bc126c5c26bd0f81e3bdce34abbd..d2f8a73cfb8ab390d80c0bfcba2159714520e19c 100644 (file)
--- a/cscript
+++ b/cscript
@@ -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 6e1f95356a06f674a4562f3a385fd4d67f89b1f3..b1b26056ba6073badf2ae48982b7332ed13132d6 100644 (file)
--- 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 34388ac82ce46d0d2e0ef89e3bab67b4e8037d0e..330d59ed858742a7c2d2785af1ca28e935dd345f 100644 (file)
--- 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;