Merge.

[dcpomatic.git] / src / lib / decoder_factory.cc

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 8674c6262e03aab9e940f3808d03940634d75e8d..c4d818f497f6d7eec7f173eea9fa445d9a666f21 100644 (file)
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -36,14 +36,14 @@ using boost::dynamic_pointer_cast;
 
 Decoders
 decoder_factory (
-       shared_ptr<Film> f, shared_ptr<const Options> o, Job* j
+       shared_ptr<Film> f, DecodeOptions o, Job* j
        )
 {
        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<AudioDecoder> (new ExternalAudioDecoder (f, o, j))
                        );
        }