diff options
Diffstat (limited to 'src/lib/decoder_factory.cc')
| -rw-r--r-- | src/lib/decoder_factory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index c4d818f49..59e15722d 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -36,21 +36,21 @@ using boost::dynamic_pointer_cast; Decoders decoder_factory ( - shared_ptr<Film> f, DecodeOptions o, Job* j + shared_ptr<Film> f, DecodeOptions o ) { 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 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); } - return Decoders (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j))); + return Decoders (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o))); } |