aboutsummaryrefslogtreecommitdiffstats
path: root/src/input/plugins/FfmpegInputPlugin.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-21 20:56:42 +0100
committerMax Kellermann <max@duempel.org>2014-12-21 20:56:42 +0100
commitfefe2df3ee8f29eeca7e27a9dc551aa15f16dfdc (patch)
tree462f0d39b714b8fb966cf9828132faa1eb378f44 /src/input/plugins/FfmpegInputPlugin.cxx
parent90b91ead721e3ba65c3e8312436c9270233538a3 (diff)
downloadmpd-fefe2df3ee8f29eeca7e27a9dc551aa15f16dfdc.tar.gz
mpd-fefe2df3ee8f29eeca7e27a9dc551aa15f16dfdc.tar.xz
mpd-fefe2df3ee8f29eeca7e27a9dc551aa15f16dfdc.zip
input/ffmpeg: use FfmpegInit() instead of av_register_all()
Make sure that the log callback is installed.
Diffstat (limited to 'src/input/plugins/FfmpegInputPlugin.cxx')
-rw-r--r--src/input/plugins/FfmpegInputPlugin.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/plugins/FfmpegInputPlugin.cxx b/src/input/plugins/FfmpegInputPlugin.cxx
index 669f8d403..701beb313 100644
--- a/src/input/plugins/FfmpegInputPlugin.cxx
+++ b/src/input/plugins/FfmpegInputPlugin.cxx
@@ -22,6 +22,7 @@
#include "config.h"
#include "FfmpegInputPlugin.hxx"
+#include "lib/ffmpeg/Init.hxx"
#include "lib/ffmpeg/Domain.hxx"
#include "lib/ffmpeg/Error.hxx"
#include "../InputStream.hxx"
@@ -31,7 +32,6 @@
extern "C" {
#include <libavformat/avio.h>
-#include <libavformat/avformat.h>
}
struct FfmpegInputStream final : public InputStream {
@@ -75,7 +75,7 @@ static InputPlugin::InitResult
input_ffmpeg_init(gcc_unused const config_param &param,
Error &error)
{
- av_register_all();
+ FfmpegInit();
/* disable this plugin if there's no registered protocol */
if (!input_ffmpeg_supported()) {