projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: reformat and rename dcpomaticContext_ -> _dcpomatic_context
[dcpomatic.git]
/
src
/
lib
/
image_decoder.cc
diff --git
a/src/lib/image_decoder.cc
b/src/lib/image_decoder.cc
index e1106f86d08f616455aa2323180d80212c4f6b3c..d743c83958d1ab148c62e8e3693bae4e532d21d5 100644
(file)
--- a/
src/lib/image_decoder.cc
+++ b/
src/lib/image_decoder.cc
@@
-19,16
+19,17
@@
*/
*/
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "film.h"
+#include "frame_interval_checker.h"
+#include "image.h"
#include "image_content.h"
#include "image_decoder.h"
#include "image_content.h"
#include "image_decoder.h"
-#include "video_decoder.h"
-#include "image.h"
-#include "ffmpeg_image_proxy.h"
#include "j2k_image_proxy.h"
#include "j2k_image_proxy.h"
-#include "film.h"
-#include "exceptions.h"
+#include "util.h"
#include "video_content.h"
#include "video_content.h"
-#include "
frame_interval_check
er.h"
+#include "
video_decod
er.h"
#include <boost/filesystem.hpp>
#include <iostream>
#include <boost/filesystem.hpp>
#include <iostream>
@@
-78,7
+79,7
@@
ImageDecoder::pass ()
}
}
}
}
- video->emit
(film(), _image, _frame_video_position
);
+ video->emit
(film(), _image, dcpomatic::ContentTime::from_frames(_frame_video_position, _image_content->video_frame_rate().get_value_or(24))
);
++_frame_video_position;
return false;
}
++_frame_video_position;
return false;
}