summaryrefslogtreecommitdiff
path: root/src/lib/decoder_factory.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/decoder_factory.cc')
-rw-r--r--src/lib/decoder_factory.cc14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index ec0140b0c..dc01a043a 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -31,44 +31,42 @@
#include "video_mxf_content.h"
#include "video_mxf_decoder.h"
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
using std::list;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-using boost::make_shared;
shared_ptr<Decoder>
decoder_factory (shared_ptr<const Content> content, shared_ptr<Log> log, bool fast)
{
shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (content);
if (fc) {
- return make_shared<FFmpegDecoder> (fc, log, fast);
+ return shared_ptr<Decoder> (new FFmpegDecoder (fc, log, fast));
}
shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (content);
if (dc) {
- return make_shared<DCPDecoder> (dc, log, fast);
+ return shared_ptr<Decoder> (new DCPDecoder (dc, log, fast));
}
shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (content);
if (ic) {
- return make_shared<ImageDecoder> (ic, log);
+ return shared_ptr<Decoder> (new ImageDecoder (ic, log));
}
shared_ptr<const TextSubtitleContent> rc = dynamic_pointer_cast<const TextSubtitleContent> (content);
if (rc) {
- return make_shared<TextSubtitleDecoder> (rc);
+ return shared_ptr<Decoder> (new TextSubtitleDecoder (rc));
}
shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (content);
if (dsc) {
- return make_shared<DCPSubtitleDecoder> (dsc);
+ return shared_ptr<Decoder> (new DCPSubtitleDecoder (dsc));
}
shared_ptr<const VideoMXFContent> vmc = dynamic_pointer_cast<const VideoMXFContent> (content);
if (vmc) {
- return make_shared<VideoMXFDecoder> (vmc, log);
+ return shared_ptr<Decoder> (new VideoMXFDecoder (vmc, log));
}
return shared_ptr<Decoder> ();