[vlc-commits] contribs: dvbpsi: fix last section handling

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jul 18 19:36:03 2019 +0200| [194f9ee1e6fc9d55f94387b5d4a9b6edc7c2cd11] | committer: Francois Cartegnie

contribs: dvbpsi: fix last section handling

(broken segmented EIT and early table output)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=194f9ee1e6fc9d55f94387b5d4a9b6edc7c2cd11
---

 .../0001-really-set-last-section-number.patch      | 28 ++++++++++++++++++++++
 contrib/src/dvbpsi/rules.mak                       |  1 +
 2 files changed, 29 insertions(+)

diff --git a/contrib/src/dvbpsi/0001-really-set-last-section-number.patch b/contrib/src/dvbpsi/0001-really-set-last-section-number.patch
new file mode 100644
index 0000000000..657703f9e7
--- /dev/null
+++ b/contrib/src/dvbpsi/0001-really-set-last-section-number.patch
@@ -0,0 +1,28 @@
+From 03a51fe87f8d9b3af092455ba43204187e2cd25a Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Thu, 18 Jul 2019 18:39:36 +0200
+Subject: [PATCH] really set last section number
+
+fixes regressions by commit
+7e9f4ed39444c84679b1135684ec2aa4f39e476c
+(early multi sections table end, segmented EIT failure)
+---
+ src/dvbpsi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dvbpsi.c b/src/dvbpsi.c
+index c5f0ddc..cbb7511 100644
+--- a/src/dvbpsi.c
++++ b/src/dvbpsi.c
+@@ -211,7 +211,7 @@ bool dvbpsi_decoder_psi_section_add(dvbpsi_decoder_t *p_decoder, dvbpsi_psi_sect
+     /* Add to end of list */
+     if (p_prev->i_number < p_section->i_number)
+     {
+-        p_decoder->i_last_section_number = p_section->i_number;
++        p_decoder->i_last_section_number = p_section->i_last_number;
+         p_prev->p_next = p_section;
+         p_section->p_next = NULL;
+     }
+-- 
+2.20.1
+
diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 518949e11a..045acd044a 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -20,6 +20,7 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
 	$(APPLY) $(SRC)/dvbpsi/dvbpsi-sys-types.patch
 	$(APPLY) $(SRC)/dvbpsi/0001-really-identify-duplicates.patch
 	$(APPLY) $(SRC)/dvbpsi/0002-really-reset-packet-counter.patch
+	$(APPLY) $(SRC)/dvbpsi/0001-really-set-last-section-number.patch
 	$(MOVE)
 
 .dvbpsi: libdvbpsi