projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix path for ffprobe.
[dcpomatic.git]
/
src
/
lib
/
decoder_factory.cc
diff --git
a/src/lib/decoder_factory.cc
b/src/lib/decoder_factory.cc
index c4d818f497f6d7eec7f173eea9fa445d9a666f21..f7f9f4074c52ae50c6e617d1bc22d967f44ff752 100644
(file)
--- a/
src/lib/decoder_factory.cc
+++ b/
src/lib/decoder_factory.cc
@@
-25,7
+25,7
@@
#include "ffmpeg_decoder.h"
#include "imagemagick_decoder.h"
#include "film.h"
#include "ffmpeg_decoder.h"
#include "imagemagick_decoder.h"
#include "film.h"
-#include "
external_audio
_decoder.h"
+#include "
sndfile
_decoder.h"
#include "decoder_factory.h"
using std::string;
#include "decoder_factory.h"
using std::string;
@@
-36,21
+36,25
@@
using boost::dynamic_pointer_cast;
Decoders
decoder_factory (
Decoders
decoder_factory (
- shared_ptr<Film> f, 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> (new
ExternalAudioDecoder (f, o, j
))
+ shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o)),
+ shared_ptr<AudioDecoder> (new
SndfileDecoder (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
SndfileDecoder (f, o
)));
}
}