diff options
| author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2011-01-06 06:13:12 +0100 |
|---|---|---|
| committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2011-01-06 06:13:12 +0100 |
| commit | 822ae13835c2f6443d5b4fface6f3f547bcfcb11 (patch) | |
| tree | 2a9c2ec01f90b8dcb26b2d873fd23443ed8d4a14 /decoder.cpp | |
| parent | 6f2fefdd9ff5f8561b3538efb5eb0765a9b4a141 (diff) | |
Implemented rudimentary ffmpeg-based decoder.
Diffstat (limited to 'decoder.cpp')
| -rw-r--r-- | decoder.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/decoder.cpp b/decoder.cpp index 9330c6e..3cfbd81 100644 --- a/decoder.cpp +++ b/decoder.cpp @@ -1,5 +1,6 @@ #include "decoder.h" #include "decoders/mpg123_decoder.h" +#include "decoders/ffmpeg_decoder.h" #include <boost/function.hpp> #include <boost/functional/factory.hpp> @@ -12,6 +13,7 @@ std::map<std::string, DecoderFactory> decoder_factories; void Decoder::init() { mpg123_init(); // initialize the mpg123 library decoder_factories["mpg123"] = boost::factory<boost::shared_ptr<DecoderMpg123> >(); + decoder_factories["ffmpeg"] = boost::factory<boost::shared_ptr<DecoderFFmpeg> >(); } Decoder::p Decoder::get(const std::string& name, const std::string& filename) { |