projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Time label.
[dcpomatic.git]
/
src
/
lib
/
decoder_factory.cc
diff --git
a/src/lib/decoder_factory.cc
b/src/lib/decoder_factory.cc
index 1d8d12cd552bf3f7236243d489026359fb94b3d5..478ccd1c18da55d155ab439270b3fa4b90a1b260 100644
(file)
--- a/
src/lib/decoder_factory.cc
+++ b/
src/lib/decoder_factory.cc
@@
-36,21
+36,25
@@
using boost::dynamic_pointer_cast;
Decoders
decoder_factory (
Decoders
decoder_factory (
- shared_ptr<Film> f,
shared_ptr<const DecodeOptions> o, Job* j
+ shared_ptr<Film> f,
DecodeOptions o
)
{
)
{
+ if (f->content().empty()) {
+ return Decoders ();
+ }
+
if (boost::filesystem::is_directory (f->content_path()) || f->content_type() == STILL) {
/* A single image file, or a directory of them */
return Decoders (
if (boost::filesystem::is_directory (f->content_path()) || f->content_type() == STILL) {
/* A single image file, or a directory of them */
return Decoders (
- shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o
, j
)),
- shared_ptr<AudioDecoder> ()
+ shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o)),
+ shared_ptr<AudioDecoder> (
new ExternalAudioDecoder (f, o)
)
);
}
);
}
- shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (f, o
, j
));
+ shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (f, o));
if (f->use_content_audio()) {
return Decoders (fd, fd);
}
if (f->use_content_audio()) {
return Decoders (fd, fd);
}
- return Decoders (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o
, j
)));
+ return Decoders (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o)));
}
}