From 90b91ead721e3ba65c3e8312436c9270233538a3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 21 Dec 2014 20:51:41 +0100 Subject: decoder/ffmpeg: move code to lib/ffmpeg/Init.cxx --- src/decoder/plugins/FfmpegDecoderPlugin.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index fcd33a790..36b13a4d1 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -26,7 +26,7 @@ #include "lib/ffmpeg/Domain.hxx" #include "lib/ffmpeg/Error.hxx" #include "lib/ffmpeg/LogError.hxx" -#include "lib/ffmpeg/LogCallback.hxx" +#include "lib/ffmpeg/Init.hxx" #include "lib/ffmpeg/Buffer.hxx" #include "../DecoderAPI.hxx" #include "FfmpegMetaData.hxx" @@ -79,9 +79,7 @@ mpd_ffmpeg_open_input(AVFormatContext **ic_ptr, static bool ffmpeg_init(gcc_unused const config_param ¶m) { - av_log_set_callback(FfmpegLogCallback); - - av_register_all(); + FfmpegInit(); return true; } -- cgit v1.2.3