From 636f5d4a1d983cdbb43b23da0da9c5db4a91f71f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 18 Aug 2014 10:12:37 +0200 Subject: {input,decoder}/ffmpeg: move ffmpeg_domain to lib/ffmpeg/Domain.cxx Eliminate duplicate definition (in input plugin and decoder plugin). --- src/input/plugins/FfmpegInputPlugin.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/input') 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 @@ -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) { -- cgit v1.2.3