[libbluray-devel] Hide meta data storage (META_ROOT)

hpi1 git at videolan.org
Thu Jun 15 00:03:35 CEST 2017


libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Thu May 18 11:16:22 2017 +0300| [8b6a4be2ca7da6f431e03d55c2a744a221255935] | committer: hpi1

Hide meta data storage (META_ROOT)

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=8b6a4be2ca7da6f431e03d55c2a744a221255935
---

 src/libbluray/bdnav/meta_data.h  | 5 -----
 src/libbluray/bdnav/meta_parse.c | 5 +++++
 src/libbluray/bdnav/meta_parse.h | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/libbluray/bdnav/meta_data.h b/src/libbluray/bdnav/meta_data.h
index 0a2c0b33..056b3272 100644
--- a/src/libbluray/bdnav/meta_data.h
+++ b/src/libbluray/bdnav/meta_data.h
@@ -46,10 +46,5 @@ typedef struct meta_dl {
     META_THUMBNAIL *     thumbnails;
 } META_DL;
 
-typedef struct meta_root {
-    uint8_t              dl_count;
-    META_DL *            dl_entries;
-} META_ROOT;
-
 #endif // _META_DATA_H_
 
diff --git a/src/libbluray/bdnav/meta_parse.c b/src/libbluray/bdnav/meta_parse.c
index e857f68f..1298b589 100644
--- a/src/libbluray/bdnav/meta_parse.c
+++ b/src/libbluray/bdnav/meta_parse.c
@@ -55,6 +55,11 @@
 
 #define MAX_META_FILE_SIZE  0xfffff
 
+struct meta_root {
+    uint8_t              dl_count;
+    META_DL *            dl_entries;
+};
+
 #ifdef HAVE_LIBXML2
 static void _parseManifestNode(xmlNode * a_node, META_DL *disclib)
 {
diff --git a/src/libbluray/bdnav/meta_parse.h b/src/libbluray/bdnav/meta_parse.h
index bc9353f9..847b6cd1 100644
--- a/src/libbluray/bdnav/meta_parse.h
+++ b/src/libbluray/bdnav/meta_parse.h
@@ -23,8 +23,11 @@
 #include "util/attributes.h"
 
 struct bd_disc;
+struct meta_dl;
 struct meta_root;
 
+typedef struct meta_root META_ROOT;
+
 BD_PRIVATE struct meta_root *     meta_parse(struct bd_disc *disc) BD_ATTR_MALLOC;
 BD_PRIVATE void                   meta_free (struct meta_root **index);
 BD_PRIVATE const struct meta_dl * meta_get  (const struct meta_root *meta_root, const char *language_code);



More information about the libbluray-devel mailing list