From 822ae13835c2f6443d5b4fface6f3f547bcfcb11 Mon Sep 17 00:00:00 2001
From: Vegard Storheil Eriksen <zyp@jvnv.net>
Date: Thu, 6 Jan 2011 06:13:12 +0100
Subject: Implemented rudimentary ffmpeg-based decoder.

---
 decoder.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'decoder.cpp')

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) {
-- 
cgit v1.2.3