summaryrefslogtreecommitdiff
path: root/src/lib/decoder_factory.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-02-08 13:07:16 +0000
committerCarl Hetherington <cth@carlh.net>2013-02-08 13:07:16 +0000
commit2e536ef0971edefea23810b99f7706881072783b (patch)
tree8b96ac62795a5953e942bd6fc0d35d8690b6dfce /src/lib/decoder_factory.cc
parent567abac0d7824f27b8fdcd6fb7da7e5ddae62a0f (diff)
Shuffle Job pointers around slightly.
Diffstat (limited to 'src/lib/decoder_factory.cc')
-rw-r--r--src/lib/decoder_factory.cc10
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)));
}