summaryrefslogtreecommitdiff
path: root/src/reel_picture_asset.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/reel_picture_asset.h')
-rw-r--r--src/reel_picture_asset.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 6eb01bc9..5a925e24 100644
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -41,8 +41,7 @@
#define LIBDCP_REEL_PICTURE_ASSET_H
-#include "reel_encryptable_asset.h"
-#include "reel_asset.h"
+#include "reel_file_asset.h"
#include "picture_asset.h"
@@ -52,7 +51,7 @@ namespace dcp {
/** @class ReelPictureAsset
* @brief Part of a Reel's description which refers to a picture asset
*/
-class ReelPictureAsset : public ReelFileAsset, public ReelEncryptableAsset
+class ReelPictureAsset : public ReelFileAsset
{
public:
ReelPictureAsset (std::shared_ptr<PictureAsset> asset, int64_t entry_point);
@@ -88,7 +87,9 @@ public:
}
private:
- std::string key_type () const;
+ boost::optional<std::string> key_type () const override {
+ return std::string ("MDIK");
+ }
Fraction _frame_rate;
Fraction _screen_aspect_ratio;