From cecf0b0563b701a4bd5c3acbcf20dc6d36a94bcb Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Thu, 11 Jul 2024 14:06:59 +0200 Subject: [PATCH] demux: mkv: add missing helpers from libebml 2.0 The const versions are more versatile. (cherry picked from commit 42945dadb88c72bd6b34a3468f4ac125d81198f1) Gbp-Pq: Name 0100-demux-mkv-add-missing-helpers-from-libebml-2.0.patch --- modules/demux/mkv/mkv.hpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp index 27a1566c..2ea8035f 100644 --- a/modules/demux/mkv/mkv.hpp +++ b/modules/demux/mkv/mkv.hpp @@ -117,6 +117,19 @@ enum #define MKV_CHECKED_PTR_DECL( name, type, src ) type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL #define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL +#if LIBEBML_VERSION < 0x020000 +template +Type * FindChild(const EbmlMaster & Master) +{ + return static_cast(Master.FindFirstElt(EBML_INFO(Type))); +} + +template +Type * FindNextChild(const EbmlMaster & Master, const Type & PastElt) +{ + return static_cast(Master.FindNextElt(PastElt)); +} +#endif using namespace LIBMATROSKA_NAMESPACE; -- 2.30.2