octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5956 from liushuyu/master 

dumping/ffmpeg_backend: add support for ffmpeg 5.0
This commit is contained in:
SachinVin 2022-02-21 20:37:11 +05:30 committed by GitHub
parent 54a36bc54f c7869ff332
commit db5edf549e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio_core/hle/ffmpeg_decoder.cpp
View File

@ -52,7 +52,7 @@ private:
Memory::MemorySystem& memory; Memory::MemorySystem& memory;
AVCodec* codec; const AVCodec* codec;
std::unique_ptr<AVCodecContext, AVCodecContextDeleter> av_context; std::unique_ptr<AVCodecContext, AVCodecContextDeleter> av_context;
std::unique_ptr<AVCodecParserContext, AVCodecParserContextDeleter> parser; std::unique_ptr<AVCodecParserContext, AVCodecParserContextDeleter> parser;
std::unique_ptr<AVPacket, AVPacketDeleter> av_packet; std::unique_ptr<AVPacket, AVPacketDeleter> av_packet;

5
src/core/dumping/ffmpeg_backend.cpp
View File

@ -758,7 +758,12 @@ void GetOptionList(std::vector<OptionInfo>& out, const AVClass* av_class, bool s
} }
const AVClass* child_class = nullptr; 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))) { while ((child_class = av_opt_child_class_next(av_class, child_class))) {
#endif
GetOptionListSingle(out, child_class); GetOptionListSingle(out, child_class);
} }
} }