mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-23 01:59:22 +01:00
Merge pull request #5956 from liushuyu/master
dumping/ffmpeg_backend: add support for ffmpeg 5.0
This commit is contained in:
commit
db5edf549e
@ -52,7 +52,7 @@ private:
|
||||
|
||||
Memory::MemorySystem& memory;
|
||||
|
||||
AVCodec* codec;
|
||||
const AVCodec* codec;
|
||||
std::unique_ptr<AVCodecContext, AVCodecContextDeleter> av_context;
|
||||
std::unique_ptr<AVCodecParserContext, AVCodecParserContextDeleter> parser;
|
||||
std::unique_ptr<AVPacket, AVPacketDeleter> av_packet;
|
||||
|
@ -758,7 +758,12 @@ void GetOptionList(std::vector<OptionInfo>& 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);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user