haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libdvbpsi: fix gcc4 build.

Browse Source
This commit is contained in:
Adrien Destugues
2014-09-12 11:34:09 +02:00
parent db57ee3d43
commit 487ad02aae
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
media-libs/libdvbpsi/patches/libdvbpsi-1.2.0.patchset
View File

@@ -44,7 +44,7 @@ index b878676..0a2e76c 100644
1.8.3.4
From b8cd8bea68c15f7202279dc04fc384c73e07dadb Mon Sep 17 00:00:00 2001
From 3562612d5fab490076c3990186535375592403d7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 12 Sep 2014 11:04:58 +0200
Subject: gcc2 fixes.
@@ -3031,7 +3031,7 @@ index 2198c61..8816809 100644
/* TS discontinuity check */
if (p_rst_decoder->b_discontinuity)
diff --git a/src/tables/sdt.c b/src/tables/sdt.c
index a159773..859ddec 100644
index a159773..bd3b19f 100644
--- a/src/tables/sdt.c
+++ b/src/tables/sdt.c
@@ -56,10 +56,13 @@
@@ -3089,23 +3089,26 @@ index a159773..859ddec 100644
p_sdt_decoder = (dvbpsi_sdt_decoder_t*)p_subdec->p_decoder;
if (p_sdt_decoder->p_building_sdt)
dvbpsi_sdt_delete(p_sdt_decoder->p_building_sdt);
@@ -350,10 +352,14 @@ void dvbpsi_sdt_sections_gather(dvbpsi_t *p_dvbpsi,
@@ -350,13 +352,15 @@ void dvbpsi_sdt_sections_gather(dvbpsi_t *p_dvbpsi,
dvbpsi_decoder_t *p_private_decoder,
dvbpsi_psi_section_t * p_section)
{
+ const uint8_t i_table_id;
- assert(p_dvbpsi);
- assert(p_dvbpsi->p_decoder);
-
+ dvbpsi_demux_t *p_demux;
+ dvbpsi_sdt_decoder_t *p_sdt_decoder;
+
assert(p_dvbpsi);
assert(p_dvbpsi->p_decoder);
- const uint8_t i_table_id = (p_section->i_table_id == 0x42 ||
+ i_table_id = (p_section->i_table_id == 0x42 ||
const uint8_t i_table_id = (p_section->i_table_id == 0x42 ||
p_section->i_table_id == 0x46) ?
p_section->i_table_id : 0x42;
@@ -364,9 +370,8 @@ void dvbpsi_sdt_sections_gather(dvbpsi_t *p_dvbpsi,
+ assert(p_dvbpsi);
+ assert(p_dvbpsi->p_decoder);
+
if (!dvbpsi_CheckPSISection(p_dvbpsi, p_section, i_table_id, "SDT decoder"))
{
dvbpsi_DeletePSISections(p_section);
@@ -364,9 +368,8 @@ void dvbpsi_sdt_sections_gather(dvbpsi_t *p_dvbpsi,
}
/* We have a valid SDT section */