From 04f201ab348f24772156f0e69aee319fc0242700 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sun, 20 Feb 2022 04:07:10 -0700 Subject: [PATCH 1/2] dumping/ffmpeg_backend: add support for ffmpeg 5.0 --- src/core/dumping/ffmpeg_backend.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/dumping/ffmpeg_backend.cpp b/src/core/dumping/ffmpeg_backend.cpp index dc7928fe0..292207b4b 100644 --- a/src/core/dumping/ffmpeg_backend.cpp +++ b/src/core/dumping/ffmpeg_backend.cpp @@ -758,7 +758,12 @@ void GetOptionList(std::vector& out, const AVClass* av_class, bool s } const AVClass* child_class = nullptr; +#if LIBAVCODEC_VERSION_MAJOR >= 59 + void* iter = nullptr; + while ((child_class = av_opt_child_class_iterate(av_class, &iter))) { +#else while ((child_class = av_opt_child_class_next(av_class, child_class))) { +#endif GetOptionListSingle(out, child_class); } } From c7869ff332e7118568ab1f2fb566b24162716f2e Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 21 Feb 2022 00:51:17 -0700 Subject: [PATCH 2/2] audio_core/hle/ffmpeg_decoder: make avcodec const --- src/audio_core/hle/ffmpeg_decoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio_core/hle/ffmpeg_decoder.cpp b/src/audio_core/hle/ffmpeg_decoder.cpp index fc2a1c87c..c9d7abe3f 100644 --- a/src/audio_core/hle/ffmpeg_decoder.cpp +++ b/src/audio_core/hle/ffmpeg_decoder.cpp @@ -52,7 +52,7 @@ private: Memory::MemorySystem& memory; - AVCodec* codec; + const AVCodec* codec; std::unique_ptr av_context; std::unique_ptr parser; std::unique_ptr av_packet;