From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 11 Jul 2024 12:06:59 +0000 (+0200)
Subject: demux: mkv: add missing helpers from libebml 2.0
X-Git-Tag: archive/raspbian/3.0.21-6+rpi1^2~25
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cecf0b0563b701a4bd5c3acbcf20dc6d36a94bcb;p=vlc.git

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
---

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<type*>(src) : NULL
 #define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast<const type*>(src) : NULL
 
+#if LIBEBML_VERSION < 0x020000
+template <typename Type>
+Type * FindChild(const EbmlMaster & Master)
+{
+  return static_cast<Type *>(Master.FindFirstElt(EBML_INFO(Type)));
+}
+
+template <typename Type>
+Type * FindNextChild(const EbmlMaster & Master, const Type & PastElt)
+{
+  return static_cast<Type *>(Master.FindNextElt(PastElt));
+}
+#endif
 
 using namespace LIBMATROSKA_NAMESPACE;