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/decoder/plugins/FfmpegDecoderPlugin.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/decoder/plugins') diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 3c0747514..097ec919f 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -22,6 +22,7 @@ #include "config.h" #include "FfmpegDecoderPlugin.hxx" +#include "lib/ffmpeg/Domain.hxx" #include "../DecoderAPI.hxx" #include "FfmpegMetaData.hxx" #include "tag/TagHandler.hxx" @@ -47,8 +48,6 @@ extern "C" { #include #include -static constexpr Domain ffmpeg_domain("ffmpeg"); - /* suppress the ffmpeg compatibility macro */ #ifdef SampleFormat #undef SampleFormat -- cgit v1.2.3