diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-23 00:21:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-23 00:21:27 +0000 |
| commit | 2a4eb72aec8515c20a19913f6fd3799eb7877857 (patch) | |
| tree | 0a6b28039439eab8245a025f80e2bd7fce50532e | |
| parent | e327e82945297e2fc878149fc5b6c507037a9d97 (diff) | |
| parent | fb03c081059cd44b48499a165f049e120800f051 (diff) | |
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
| -rw-r--r-- | src/reel_asset.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reel_asset.cc b/src/reel_asset.cc index ecaaa1fc..654cde03 100644 --- a/src/reel_asset.cc +++ b/src/reel_asset.cc @@ -60,7 +60,7 @@ ReelAsset::ReelAsset (shared_ptr<Asset> asset, Fraction edit_rate, int64_t intri , _intrinsic_duration (intrinsic_duration) , _entry_point (entry_point) , _duration (intrinsic_duration - entry_point) - , _hash (make_digest (asset->file (), 0)) + , _hash (asset->hash ()) { /* default _annotation_text to the leaf name of our file */ _annotation_text = asset->file().leaf().string (); |