projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested merge of master.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index 577dbd14d084ba6fe8a19db0c8870935a7d7d9dd..719c4cb53ecf03488d8266954b6309205657bb5e 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-115,7
+115,7
@@
FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
Content::examine (film, job, quick);
Content::examine (film, job, quick);
- shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false
, true
));
+ shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false));
ContentVideoFrame video_length = 0;
if (quick) {
ContentVideoFrame video_length = 0;
if (quick) {