aboutsummaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-08-18 10:12:37 +0200
committerMax Kellermann <max@duempel.org>2014-08-18 10:12:37 +0200
commit636f5d4a1d983cdbb43b23da0da9c5db4a91f71f (patch)
treeaf88f1829d5d3f4883545b2af3db87682c9d5a40 /src/input
parent41a4b280eea21dd584225bb394a0522ddf504964 (diff)
downloadmpd-636f5d4a1d983cdbb43b23da0da9c5db4a91f71f.tar.gz
mpd-636f5d4a1d983cdbb43b23da0da9c5db4a91f71f.tar.xz
mpd-636f5d4a1d983cdbb43b23da0da9c5db4a91f71f.zip
{input,decoder}/ffmpeg: move ffmpeg_domain to lib/ffmpeg/Domain.cxx
Eliminate duplicate definition (in input plugin and decoder plugin).
Diffstat (limited to 'src/input')
-rw-r--r--src/input/plugins/FfmpegInputPlugin.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/input/plugins/FfmpegInputPlugin.cxx b/src/input/plugins/FfmpegInputPlugin.cxx
index 05ad20c36..130521ca2 100644
--- a/src/input/plugins/FfmpegInputPlugin.cxx
+++ b/src/input/plugins/FfmpegInputPlugin.cxx
@@ -22,11 +22,11 @@
#include "config.h"
#include "FfmpegInputPlugin.hxx"
+#include "lib/ffmpeg/Domain.hxx"
#include "../InputStream.hxx"
#include "../InputPlugin.hxx"
#include "util/StringUtil.hxx"
#include "util/Error.hxx"
-#include "util/Domain.hxx"
extern "C" {
#include <libavformat/avio.h>
@@ -63,8 +63,6 @@ struct FfmpegInputStream final : public InputStream {
bool Seek(offset_type offset, Error &error) override;
};
-static constexpr Domain ffmpeg_domain("ffmpeg");
-
static inline bool
input_ffmpeg_supported(void)
{