projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5a18da
)
Fix initial length of stills.
author
Carl Hetherington
<cth@carlh.net>
Fri, 19 Jul 2013 12:02:41 +0000
(13:02 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 19 Jul 2013 12:02:41 +0000
(13:02 +0100)
src/lib/imagemagick_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/imagemagick_content.cc
b/src/lib/imagemagick_content.cc
index 79623b21c493ef62293fdc9f8e55526aaa08e4d3..d427e00b2e3f40211b5d33226d89ba905154174a 100644
(file)
--- a/
src/lib/imagemagick_content.cc
+++ b/
src/lib/imagemagick_content.cc
@@
-27,6
+27,7
@@
#include "i18n.h"
using std::string;
+using std::cout;
using std::stringstream;
using boost::shared_ptr;
@@
-76,8
+77,8
@@
ImageMagickContent::examine (shared_ptr<Job> job)
shared_ptr<ImageMagickExaminer> examiner (new ImageMagickExaminer (film, shared_from_this()));
- set_video_length (Config::instance()->default_still_length() * video_frame_rate());
take_from_video_examiner (examiner);
+ set_video_length (Config::instance()->default_still_length() * video_frame_rate());
}
void