projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.h
diff --git
a/src/lib/image_decoder.h
b/src/lib/image_decoder.h
index f4d81dfb507a5ef545c0f573542904472d023956..63b4c58e344f42ece958d7a58e75441d00da216c 100644
(file)
--- a/
src/lib/image_decoder.h
+++ b/
src/lib/image_decoder.h
@@
-41,6
+41,6
@@
private:
boost::shared_ptr<const ImageContent> _image_content;
boost::shared_ptr<Image> _image;
-
ContentTi
me _video_position;
+
VideoFra
me _video_position;
};