diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-18 10:12:37 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-18 10:12:37 +0200 |
| commit | 636f5d4a1d983cdbb43b23da0da9c5db4a91f71f (patch) | |
| tree | af88f1829d5d3f4883545b2af3db87682c9d5a40 /src/decoder/plugins/FfmpegDecoderPlugin.cxx | |
| parent | 41a4b280eea21dd584225bb394a0522ddf504964 (diff) | |
| download | mpd-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/decoder/plugins/FfmpegDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
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 <assert.h> #include <string.h> -static constexpr Domain ffmpeg_domain("ffmpeg"); - /* suppress the ffmpeg compatibility macro */ #ifdef SampleFormat #undef SampleFormat |