summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2019-06-19 14:13:14 -0700
committerJohn Stebbins <[email protected]>2019-06-28 12:06:03 -0700
commit3e2f9fb57f48c591c2c1969a15cc9826241cfc55 (patch)
tree06d4303dedf9a07faebf1bb8c2d6da41ec2693fd /libhb
parentedeffe2f8f5f6c5e3a8ff3dfaf31659318ca472e (diff)
Fix gcc 9 compiler warnings
gcc 9 is quite a lot chattier and clutters the build log with useless information :\
Diffstat (limited to 'libhb')
-rw-r--r--libhb/decavcodec.c5
-rw-r--r--libhb/dvd.c18
-rw-r--r--libhb/dvdnav.c18
3 files changed, 21 insertions, 20 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index 340066364..0b851e842 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -418,7 +418,7 @@ static void audioParserFlush(hb_work_object_t * w)
hb_work_private_t * pv = w->private_data;
uint8_t * pout = NULL;
int pout_len = 0;
- int64_t parser_pts;
+ int64_t parser_pts = AV_NOPTS_VALUE;
do
{
@@ -1647,7 +1647,8 @@ static void videoParserFlush(hb_work_object_t * w)
int result;
uint8_t * pout = NULL;
int pout_len = 0;
- int64_t parser_pts, parser_dts;
+ int64_t parser_pts = AV_NOPTS_VALUE;
+ int64_t parser_dts = AV_NOPTS_VALUE;
do
{
diff --git a/libhb/dvd.c b/libhb/dvd.c
index 5708934bf..12611d397 100644
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -175,7 +175,7 @@ static int hb_dvdread_title_count( hb_dvd_t * e )
static void add_subtitle( hb_list_t * list_subtitle, int position,
iso639_lang_t * lang, int lang_extension,
- uint32_t * palette, int style )
+ uint8_t * palette, int style )
{
hb_subtitle_t * subtitle;
int ii, count;
@@ -616,8 +616,8 @@ static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t, uint64_t min_dur
// Add Wide Screen subtitle.
pos = (spu_control >> 16) & 0x1F;
add_subtitle(title->list_subtitle, pos, lang, lang_ext,
- vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
- HB_VOBSUB_STYLE_WIDE);
+ (uint8_t*)vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
+ HB_VOBSUB_STYLE_WIDE);
// permitted_df
// 1 - Letterbox not permitted
@@ -628,24 +628,24 @@ static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t, uint64_t min_dur
// Letterbox permitted. Add Letterbox subtitle.
pos = (spu_control >> 8) & 0x1F;
add_subtitle(title->list_subtitle, pos, lang, lang_ext,
- vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
- HB_VOBSUB_STYLE_LETTERBOX);
+ (uint8_t*)vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
+ HB_VOBSUB_STYLE_LETTERBOX);
}
if (!(vts->vtsi_mat->vts_video_attr.permitted_df & 2))
{
// Pan&Scan permitted. Add Pan&Scan subtitle.
pos = spu_control & 0x1F;
add_subtitle(title->list_subtitle, pos, lang, lang_ext,
- vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
- HB_VOBSUB_STYLE_PANSCAN);
+ (uint8_t*)vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
+ HB_VOBSUB_STYLE_PANSCAN);
}
}
else
{
pos = (spu_control >> 24) & 0x1F;
add_subtitle(title->list_subtitle, pos, lang, lang_ext,
- vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
- HB_VOBSUB_STYLE_4_3);
+ (uint8_t*)vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
+ HB_VOBSUB_STYLE_4_3);
}
}
diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c
index 9eb5534ed..6e165024b 100644
--- a/libhb/dvdnav.c
+++ b/libhb/dvdnav.c
@@ -319,7 +319,7 @@ PttDuration(ifo_handle_t *ifo, int ttn, int pttn, int *blocks, int *last_pgcn)
static void add_subtitle( hb_list_t * list_subtitle, int position,
iso639_lang_t * lang, int lang_extension,
- uint32_t * palette, int style )
+ uint8_t * palette, int style )
{
hb_subtitle_t * subtitle;
int ii, count;
@@ -797,8 +797,8 @@ static hb_title_t * hb_dvdnav_title_scan( hb_dvd_t * e, int t, uint64_t min_dura
// Add Wide Screen subtitle.
pos = (spu_control >> 16) & 0x1F;
add_subtitle(title->list_subtitle, pos, lang, lang_ext,
- ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
- HB_VOBSUB_STYLE_WIDE);
+ (uint8_t*)ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
+ HB_VOBSUB_STYLE_WIDE);
// permitted_df
// 1 - Letterbox not permitted
@@ -809,24 +809,24 @@ static hb_title_t * hb_dvdnav_title_scan( hb_dvd_t * e, int t, uint64_t min_dura
// Letterbox permitted. Add Letterbox subtitle.
pos = (spu_control >> 8) & 0x1F;
add_subtitle(title->list_subtitle, pos, lang, lang_ext,
- ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
- HB_VOBSUB_STYLE_LETTERBOX);
+ (uint8_t*)ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
+ HB_VOBSUB_STYLE_LETTERBOX);
}
if (!(ifo->vtsi_mat->vts_video_attr.permitted_df & 2))
{
// Pan&Scan permitted. Add Pan&Scan subtitle.
pos = spu_control & 0x1F;
add_subtitle(title->list_subtitle, pos, lang, lang_ext,
- ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
- HB_VOBSUB_STYLE_PANSCAN);
+ (uint8_t*)ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
+ HB_VOBSUB_STYLE_PANSCAN);
}
}
else
{
pos = (spu_control >> 24) & 0x1F;
add_subtitle(title->list_subtitle, pos, lang, lang_ext,
- ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
- HB_VOBSUB_STYLE_4_3);
+ (uint8_t*)ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
+ HB_VOBSUB_STYLE_4_3);
}
}