projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e330669
)
Ask asset to make hash so that we get an already-calculated one if it exists.
author
Carl Hetherington
<cth@carlh.net>
Fri, 18 Dec 2015 15:16:23 +0000
(15:16 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 18 Dec 2015 15:16:23 +0000
(15:16 +0000)
src/reel_asset.cc
patch
|
blob
|
history
diff --git
a/src/reel_asset.cc
b/src/reel_asset.cc
index ecaaa1fc9f4e4afc102f7bd8222a60faab8938a5..654cde031effe73f83304b53710d102697d5c999 100644
(file)
--- 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 ();