From fefe2df3ee8f29eeca7e27a9dc551aa15f16dfdc Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 21 Dec 2014 20:56:42 +0100
Subject: input/ffmpeg: use FfmpegInit() instead of av_register_all()

Make sure that the log callback is installed.
---
 src/input/plugins/FfmpegInputPlugin.cxx | 4 ++--
 1 file 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()) {
-- 
cgit v1.2.3