owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use av_dict_iterate only if supported, fixes #801

Browse Source
This commit is contained in:
emeric
2026-01-04 12:34:57 +01:00
parent ae92f5c156
commit ac0a10147f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/audio/impl/ffmpeg/AudioFile.cpp
+10 -1
View File
@@ -37,13 +37,15 @@ extern "C"
#include "audio/Exception.hpp" #include "audio/Exception.hpp"
#define LMS_FFMPEG_HAS_AV_DICT_ITERATE (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 37, 100))
namespace lms::audio::ffmpeg namespace lms::audio::ffmpeg
{ {
namespace namespace
{ {
std::string averror_to_string(int error) std::string averror_to_string(int error)
{ {
std::array<char, 128> buf = { 0 }; std::array<char, 128> buf{ 0 };
if (::av_strerror(error, buf.data(), buf.size()) == 0) if (::av_strerror(error, buf.data(), buf.size()) == 0)
return buf.data(); return buf.data();
@@ -65,9 +67,16 @@ namespace lms::audio::ffmpeg
if (!dictionnary) if (!dictionnary)
return; return;
#if LMS_FFMPEG_HAS_AV_DICT_ITERATE
const AVDictionaryEntry* tag{ NULL }; const AVDictionaryEntry* tag{ NULL };
while ((tag = av_dict_iterate(dictionnary, tag))) while ((tag = av_dict_iterate(dictionnary, tag)))
res[core::stringUtils::stringToUpper(tag->key)] = tag->value; res[core::stringUtils::stringToUpper(tag->key)] = tag->value;
#else
AVDictionaryEntry* tag{};
while ((tag = av_dict_get(dictionnary, "", tag, AV_DICT_IGNORE_SUFFIX)))
res[core::stringUtils::stringToUpper(tag->key)] = tag->value;
#endif // LMS_FFMPEG_HAS_AV_DICT_ITERATE
} }
std::optional<core::media::Container> avdemuxerToContainerType(std::string_view name) std::optional<core::media::Container> avdemuxerToContainerType(std::string_view name)