summaryrefslogtreecommitdiff
path: root/src/reel_picture_asset.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-05 00:18:00 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-05 14:37:01 +0100
commit82787546680784a2a6e0993ab5b570f0db3a2d4d (patch)
tree621aaf7d25e539bc02448647aead0e0affd0932a /src/reel_picture_asset.cc
parentfe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc (diff)
Rename ReelMXFAsset -> ReelEncryptableAsset.
Diffstat (limited to 'src/reel_picture_asset.cc')
-rw-r--r--src/reel_picture_asset.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index fd18dc30..a989f72b 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ ReelPictureAsset::ReelPictureAsset ()
}
ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point)
- : ReelMXFAsset (asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+ : ReelEncryptableAsset (asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
, _frame_rate (asset->frame_rate ())
, _screen_aspect_ratio (asset->screen_aspect_ratio ())
{
@@ -52,7 +52,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr
}
ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
- : ReelMXFAsset (node)
+ : ReelEncryptableAsset (node)
{
_frame_rate = Fraction (node->string_child ("FrameRate"));
try {