Skip to content

M
mpd
Commit fefe2df3 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

input/ffmpeg: use FfmpegInit() instead of av_register_all()

Make sure that the log callback is installed.
parent 90b91ead
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/input/plugins/FfmpegInputPlugin.cxx
View file @ fefe2df3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include "FfmpegInputPlugin.hxx" #include "FfmpegInputPlugin.hxx"
#include "lib/ffmpeg/Init.hxx"
#include "lib/ffmpeg/Domain.hxx" #include "lib/ffmpeg/Domain.hxx"
#include "lib/ffmpeg/Error.hxx" #include "lib/ffmpeg/Error.hxx"
#include "../InputStream.hxx" #include "../InputStream.hxx"
...@@ -31,7 +32,6 @@ ...@@ -31,7 +32,6 @@
extern "C" { extern "C" {
#include <libavformat/avio.h> #include <libavformat/avio.h>
#include <libavformat/avformat.h>
} }
struct FfmpegInputStream final : public InputStream { struct FfmpegInputStream final : public InputStream {
...@@ -75,7 +75,7 @@ static InputPlugin::InitResult ...@@ -75,7 +75,7 @@ static InputPlugin::InitResult
input_ffmpeg_init(gcc_unused const config_param &param, input_ffmpeg_init(gcc_unused const config_param &param,
Error &error) Error &error)
{ {
av_register_all(); FfmpegInit();
/* disable this plugin if there's no registered protocol */ /* disable this plugin if there's no registered protocol */
if (!input_ffmpeg_supported()) { if (!input_ffmpeg_supported()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment