[libbluray-devel] Expose nav_find_main_title only to mlps_dump.

Diego Elio Pettenò git at videolan.org
Mon Feb 25 07:51:37 CET 2013


libbluray | branch: flameeyes | Diego Elio Pettenò <flameeyes at flameeyes.eu> | Thu Feb 14 23:17:55 2013 -0800| [48dbb681709c11e9bd089a8c391de5ec8744c844] | committer: Diego Elio Pettenò

Expose nav_find_main_title only to mlps_dump.

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

 Makefile.am                      |    2 +-
 src/libbluray/bdnav/navigation.c |    2 ++
 src/libbluray/bdnav/navigation.h |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 1a886e9..c9a81ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,7 +118,7 @@ EXTRA_PROGRAMS = \
 # the overriding of CFLAGS is necessary to ensure that automake will
 # rebuild different objects for different targets.
 
-mpls_dump_CFLAGS = $(AM_CFLAGS)
+mpls_dump_CFLAGS = $(AM_CFLAGS) -DMPLS_DUMP
 mpls_dump_SOURCES = \
 	src/examples/mpls_dump.c \
 	src/examples/util.c \
diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
index b4e6971..9a4ea43 100644
--- a/src/libbluray/bdnav/navigation.c
+++ b/src/libbluray/bdnav/navigation.c
@@ -214,6 +214,7 @@ void nav_free_title_list(NAV_TITLE_LIST *title_list)
     X_FREE(title_list);
 }
 
+#ifdef MPLS_DUMP
 char* nav_find_main_title(const char *root)
 {
     BD_DIR_H *dir;
@@ -284,6 +285,7 @@ char* nav_find_main_title(const char *root)
         return NULL;
     }
 }
+#endif
 
 uint8_t nav_lookup_aspect(NAV_CLIP *clip, int pid)
 {
diff --git a/src/libbluray/bdnav/navigation.h b/src/libbluray/bdnav/navigation.h
index 497e903..b4498a4 100644
--- a/src/libbluray/bdnav/navigation.h
+++ b/src/libbluray/bdnav/navigation.h
@@ -136,7 +136,9 @@ struct nav_title_list_s
 };
 
 BD_PRIVATE uint8_t nav_lookup_aspect(NAV_CLIP *clip, int pid);
+#ifdef MLPS_DUMP
 BD_PRIVATE char* nav_find_main_title(const char *root);
+#endif
 BD_PRIVATE NAV_TITLE* nav_title_open(const char *root, const char *playlist, unsigned angle);
 BD_PRIVATE void nav_title_close(NAV_TITLE *title);
 BD_PRIVATE NAV_CLIP* nav_next_clip(NAV_TITLE *title, NAV_CLIP *clip);



More information about the libbluray-devel mailing list