projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Another try at sorting out the thorny question of timing.
[dcpomatic.git]
/
src
/
lib
/
imagemagick_content.cc
diff --git
a/src/lib/imagemagick_content.cc
b/src/lib/imagemagick_content.cc
index f9ee8cc84029d0cceb01ce845d272ceda8a62484..2fd65ffa0d403d607fd7b2a835d9b71710516746 100644
(file)
--- a/
src/lib/imagemagick_content.cc
+++ b/
src/lib/imagemagick_content.cc
@@
-87,7
+87,7
@@
ImageMagickContent::clone () const
}
void
-ImageMagickContent::set_video_length (
ContentVideo
Frame len)
+ImageMagickContent::set_video_length (
VideoContent::
Frame len)
{
{
boost::mutex::scoped_lock lm (_mutex);