[libbluray-devel] Fix parsing of secondary stream attributes

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Mon Apr  3 12:45:57 2017 +0300| [e5fa0aa73c6d4e8f63c773c0df62d504727ef084] | committer: hpi1

Fix parsing of secondary stream attributes

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

 src/libbluray/bdnav/mpls_parse.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/libbluray/bdnav/mpls_parse.c b/src/libbluray/bdnav/mpls_parse.c
index d922b491..4e24c31c 100644
--- a/src/libbluray/bdnav/mpls_parse.c
+++ b/src/libbluray/bdnav/mpls_parse.c
@@ -323,14 +323,14 @@ _parse_stn(BITSTREAM *bits, MPLS_STN *stn)
                 return 0;
             }
             // Read Secondary Audio Extra Attributes
-            ss->sa_num_primary_audio_ref = bs_read(bits, 8);
+            ss[ii].sa_num_primary_audio_ref = bs_read(bits, 8);
             bs_skip(bits, 8);
-            if (ss->sa_num_primary_audio_ref) {
-                ss->sa_primary_audio_ref = calloc(ss->sa_num_primary_audio_ref, sizeof(uint8_t));
-                for (jj = 0; jj < ss->sa_num_primary_audio_ref; jj++) {
-                   ss->sa_primary_audio_ref[jj] = bs_read(bits, 8);
+            if (ss[ii].sa_num_primary_audio_ref) {
+                ss[ii].sa_primary_audio_ref = calloc(ss[ii].sa_num_primary_audio_ref, sizeof(uint8_t));
+                for (jj = 0; jj < ss[ii].sa_num_primary_audio_ref; jj++) {
+                   ss[ii].sa_primary_audio_ref[jj] = bs_read(bits, 8);
                 }
-                if (ss->sa_num_primary_audio_ref % 2) {
+                if (ss[ii].sa_num_primary_audio_ref % 2) {
                     bs_skip(bits, 8);
                 }
             }
@@ -349,25 +349,25 @@ _parse_stn(BITSTREAM *bits, MPLS_STN *stn)
                 return 0;
             }
             // Read Secondary Video Extra Attributes
-            ss->sv_num_secondary_audio_ref = bs_read(bits, 8);
-           bs_skip(bits, 8);
-            if (ss->sv_num_secondary_audio_ref) {
-                ss->sv_secondary_audio_ref = calloc(ss->sv_num_secondary_audio_ref, sizeof(uint8_t));
-                for (jj = 0; jj < ss->sv_num_secondary_audio_ref; jj++) {
-                    ss->sv_secondary_audio_ref[jj] = bs_read(bits, 8);
+            ss[ii].sv_num_secondary_audio_ref = bs_read(bits, 8);
+            bs_skip(bits, 8);
+            if (ss[ii].sv_num_secondary_audio_ref) {
+                ss[ii].sv_secondary_audio_ref = calloc(ss[ii].sv_num_secondary_audio_ref, sizeof(uint8_t));
+                for (jj = 0; jj < ss[ii].sv_num_secondary_audio_ref; jj++) {
+                    ss[ii].sv_secondary_audio_ref[jj] = bs_read(bits, 8);
                 }
-                if (ss->sv_num_secondary_audio_ref % 2) {
+                if (ss[ii].sv_num_secondary_audio_ref % 2) {
                     bs_skip(bits, 8);
                 }
             }
-            ss->sv_num_pip_pg_ref = bs_read(bits, 8);
+            ss[ii].sv_num_pip_pg_ref = bs_read(bits, 8);
             bs_skip(bits, 8);
-            if (ss->sv_num_pip_pg_ref) {
-                ss->sv_pip_pg_ref = calloc(ss->sv_num_pip_pg_ref, sizeof(uint8_t));
-                for (jj = 0; jj < ss->sv_num_pip_pg_ref; jj++) {
-                    ss->sv_pip_pg_ref[jj] = bs_read(bits, 8);
+            if (ss[ii].sv_num_pip_pg_ref) {
+                ss[ii].sv_pip_pg_ref = calloc(ss[ii].sv_num_pip_pg_ref, sizeof(uint8_t));
+                for (jj = 0; jj < ss[ii].sv_num_pip_pg_ref; jj++) {
+                    ss[ii].sv_pip_pg_ref[jj] = bs_read(bits, 8);
                 }
-                if (ss->sv_num_pip_pg_ref % 2) {
+                if (ss[ii].sv_num_pip_pg_ref % 2) {
                     bs_skip(bits, 8);
                 }
             }