diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-05 18:41:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-05 18:41:44 +0100 |
| commit | 26c7fc71df9a6207696323e6f62b2020da2a9435 (patch) | |
| tree | 543ce72f72a9bf21527e41071a6304d903e3f7e0 /src/reel_picture_asset.cc | |
| parent | ca6a4a18769e57dfe2c6896c87db1566e9ecda0d (diff) | |
Make ReelEncryptableAsset like MXF.
Diffstat (limited to 'src/reel_picture_asset.cc')
| -rw-r--r-- | src/reel_picture_asset.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc index 92a51839..86630e13 100644 --- a/src/reel_picture_asset.cc +++ b/src/reel_picture_asset.cc @@ -44,7 +44,8 @@ ReelPictureAsset::ReelPictureAsset () } ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point) - : ReelEncryptableAsset (asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) + : ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point) + , ReelEncryptableAsset (asset->key_id()) , _frame_rate (asset->frame_rate ()) , _screen_aspect_ratio (asset->screen_aspect_ratio ()) { @@ -52,7 +53,8 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr } ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node) - : ReelEncryptableAsset (node) + : ReelAsset (node) + , ReelEncryptableAsset (node) { _frame_rate = Fraction (node->string_child ("FrameRate")); try { |