[libbluray-devel] mpls_parse: remove unused field MPLS_PLM.mark_id

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Thu Apr 14 11:31:08 2016 +0300| [cef81a0614a7a29d161574bd03b86e3caa50c473] | committer: hpi1

mpls_parse: remove unused field MPLS_PLM.mark_id

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

 src/libbluray/bdnav/mpls_parse.c |    2 +-
 src/libbluray/bdnav/mpls_parse.h |    1 -
 src/libbluray/bdnav/navigation.c |    3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libbluray/bdnav/mpls_parse.c b/src/libbluray/bdnav/mpls_parse.c
index da01f7b..e196118 100644
--- a/src/libbluray/bdnav/mpls_parse.c
+++ b/src/libbluray/bdnav/mpls_parse.c
@@ -671,7 +671,7 @@ _parse_playlistmark(BITSTREAM *bits, MPLS_PL *pl)
 
     plm = calloc(pl->mark_count, sizeof(MPLS_PLM));
     for (ii = 0; ii < pl->mark_count; ii++) {
-        plm[ii].mark_id       = bs_read(bits, 8);
+        bs_skip(bits, 8); /* reserved */
         plm[ii].mark_type     = bs_read(bits, 8);
         plm[ii].play_item_ref = bs_read(bits, 16);
         plm[ii].time          = bs_read(bits, 32);
diff --git a/src/libbluray/bdnav/mpls_parse.h b/src/libbluray/bdnav/mpls_parse.h
index f9f7a18..94bfa67 100644
--- a/src/libbluray/bdnav/mpls_parse.h
+++ b/src/libbluray/bdnav/mpls_parse.h
@@ -94,7 +94,6 @@ typedef struct
 
 typedef struct
 {
-    uint8_t         mark_id;
     uint8_t         mark_type;
     uint16_t        play_item_ref;
     uint32_t        time;
diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
index e28eeb9..ed9b96e 100644
--- a/src/libbluray/bdnav/navigation.c
+++ b/src/libbluray/bdnav/navigation.c
@@ -133,8 +133,7 @@ static int _pi_cmp(MPLS_PI *pi1, MPLS_PI *pi2)
 
 static int _pm_cmp(MPLS_PLM *pm1, MPLS_PLM *pm2)
 {
-    if (pm1->mark_id       == pm2->mark_id       &&
-        pm1->mark_type     == pm2->mark_type     &&
+    if (pm1->mark_type     == pm2->mark_type     &&
         pm1->play_item_ref == pm2->play_item_ref &&
         pm1->time          == pm2->time          &&
         pm1->entry_es_pid  == pm2->entry_es_pid  &&