PD#132481: fix Android 7.0 compile error

96 files changed, 13 insertions, 1 deletions

diff --git a/ntsc_decode/am_vbi.c b/ntsc_decode/am_vbi.c
index 257b172..85d82fb 100755
--- a/ntsc_decode/am_vbi.c
+++ b/ntsc_decode/am_vbi.c
@@ -37,6 +37,7 @@ vbi_pgno		pgno = -1;
 
 //AM_VBI_Parser_t *parser = NULL;
 
+#if 0
 static void
 reset				(AM_VBI_Parser_t *parser)
 {
@@ -52,7 +53,7 @@ reset				(AM_VBI_Parser_t *parser)
 
 	vbi_unref_page (&page);
 }
-
+#endif
 /**********************************************************/
 
 
diff --git a/src/_videodev.h b/src/_videodev.h
index 0b41618..0b41618 100755..100644
--- a/src/_videodev.h
+++ b/src/_videodev.h
diff --git a/src/_videodev2.h b/src/_videodev2.h
index 3aca316..3aca316 100755..100644
--- a/src/_videodev2.h
+++ b/src/_videodev2.h
diff --git a/src/_videodev2k.h b/src/_videodev2k.h
index dbfc0c0..dbfc0c0 100755..100644
--- a/src/_videodev2k.h
+++ b/src/_videodev2k.h
diff --git a/src/bcd.h b/src/bcd.h
index 7fb0465..7fb0465 100755..100644
--- a/src/bcd.h
+++ b/src/bcd.h
diff --git a/src/bit_slicer.c b/src/bit_slicer.c
index fb1dc52..fb1dc52 100755..100644
--- a/src/bit_slicer.c
+++ b/src/bit_slicer.c
diff --git a/src/bit_slicer.h b/src/bit_slicer.h
index 2ee09c4..2ee09c4 100755..100644
--- a/src/bit_slicer.h
+++ b/src/bit_slicer.h
diff --git a/src/cache-priv.h b/src/cache-priv.h
index a60ed37..a60ed37 100755..100644
--- a/src/cache-priv.h
+++ b/src/cache-priv.h
diff --git a/src/cache.c b/src/cache.c
index 0aa079d..0aa079d 100755..100644
--- a/src/cache.c
+++ b/src/cache.c
diff --git a/src/cache.h b/src/cache.h
index 3050f4c..3050f4c 100755..100644
--- a/src/cache.h
+++ b/src/cache.h
diff --git a/src/caption.c b/src/caption.c
index 90e7a67..90e7a67 100755..100644
--- a/src/caption.c
+++ b/src/caption.c
diff --git a/src/cc.h b/src/cc.h
index 2267b16..2267b16 100755..100644
--- a/src/cc.h
+++ b/src/cc.h
diff --git a/src/ccfont2.xbm b/src/ccfont2.xbm
index 9987c67..9987c67 100755..100644
--- a/src/ccfont2.xbm
+++ b/src/ccfont2.xbm
diff --git a/src/chains.c b/src/chains.c
index c54bfff..c54bfff 100755..100644
--- a/src/chains.c
+++ b/src/chains.c
diff --git a/src/conv.c b/src/conv.c
index c9784f1..c9784f1 100755..100644
--- a/src/conv.c
+++ b/src/conv.c
diff --git a/src/conv.h b/src/conv.h
index e3943cc..e3943cc 100755..100644
--- a/src/conv.h
+++ b/src/conv.h
diff --git a/src/decoder.c b/src/decoder.c
index 818b762..818b762 100755..100644
--- a/src/decoder.c
+++ b/src/decoder.c
diff --git a/src/decoder.h b/src/decoder.h
index 788a412..788a412 100755..100644
--- a/src/decoder.h
+++ b/src/decoder.h
diff --git a/src/dlist.h b/src/dlist.h
index 121f0f1..121f0f1 100755..100644
--- a/src/dlist.h
+++ b/src/dlist.h
diff --git a/src/dtvcc.c b/src/dtvcc.c
index 154f27f..bb12255 100755..100644
--- a/src/dtvcc.c
+++ b/src/dtvcc.c
@@ -95,6 +95,13 @@ do {									\
 #  define PRIx64 "llx"
 #endif
 
+extern void
+vbi_transp_colormap(vbi_decoder *vbi, vbi_rgba *d, vbi_rgba *s, int entries);
+extern void
+vbi_send_event(vbi_decoder *vbi, vbi_event *ev);
+extern void
+vbi_decode_caption(vbi_decoder *vbi, int line, uint8_t *buf);
+
 /* EIA 608-B decoder. */
 
 static int
diff --git a/src/dtvcc.h b/src/dtvcc.h
index 24f4f58..24f4f58 100755..100644
--- a/src/dtvcc.h
+++ b/src/dtvcc.h
diff --git a/src/dvb.h b/src/dvb.h
index 8c8a764..8c8a764 100755..100644
--- a/src/dvb.h
+++ b/src/dvb.h
diff --git a/src/dvb_demux.c b/src/dvb_demux.c
index 834ef31..834ef31 100755..100644
--- a/src/dvb_demux.c
+++ b/src/dvb_demux.c
diff --git a/src/dvb_demux.h b/src/dvb_demux.h
index fc1de41..fc1de41 100755..100644
--- a/src/dvb_demux.h
+++ b/src/dvb_demux.h
diff --git a/src/dvb_mux.c b/src/dvb_mux.c
index 530e0e3..530e0e3 100755..100644
--- a/src/dvb_mux.c
+++ b/src/dvb_mux.c
diff --git a/src/dvb_mux.h b/src/dvb_mux.h
index 6a7c6fb..6a7c6fb 100755..100644
--- a/src/dvb_mux.h
+++ b/src/dvb_mux.h
diff --git a/src/event.h b/src/event.h
index 7b699a3..7b699a3 100755..100644
--- a/src/event.h
+++ b/src/event.h
diff --git a/src/exp-gfx.h b/src/exp-gfx.h
index 3f3b4a2..3f3b4a2 100755..100644
--- a/src/exp-gfx.h
+++ b/src/exp-gfx.h
diff --git a/src/exp-html.c b/src/exp-html.c
index 8b273db..8b273db 100755..100644
--- a/src/exp-html.c
+++ b/src/exp-html.c
diff --git a/src/exp-templ.c b/src/exp-templ.c
index 2b1a831..2b1a831 100755..100644
--- a/src/exp-templ.c
+++ b/src/exp-templ.c
diff --git a/src/exp-txt.c b/src/exp-txt.c
index d7b96b1..d7b96b1 100755..100644
--- a/src/exp-txt.c
+++ b/src/exp-txt.c
diff --git a/src/exp-txt.h b/src/exp-txt.h
index 60aeb84..60aeb84 100755..100644
--- a/src/exp-txt.h
+++ b/src/exp-txt.h
diff --git a/src/exp-vtx.c b/src/exp-vtx.c
index e6cfd6e..e6cfd6e 100755..100644
--- a/src/exp-vtx.c
+++ b/src/exp-vtx.c
diff --git a/src/export.c b/src/export.c
index 1204885..1204885 100755..100644
--- a/src/export.c
+++ b/src/export.c
diff --git a/src/export.h b/src/export.h
index 5b4ceab..5b4ceab 100755..100644
--- a/src/export.h
+++ b/src/export.h
diff --git a/src/format.h b/src/format.h
index db50c8a..db50c8a 100755..100644
--- a/src/format.h
+++ b/src/format.h
diff --git a/src/hamm-tables.h b/src/hamm-tables.h
index d513186..d513186 100755..100644
--- a/src/hamm-tables.h
+++ b/src/hamm-tables.h
diff --git a/src/hamm.c b/src/hamm.c
index 5e87ac6..5e87ac6 100755..100644
--- a/src/hamm.c
+++ b/src/hamm.c
diff --git a/src/hamm.h b/src/hamm.h
index d3df56d..d3df56d 100755..100644
--- a/src/hamm.h
+++ b/src/hamm.h
diff --git a/src/idl_demux.c b/src/idl_demux.c
index f07b3fd..f07b3fd 100755..100644
--- a/src/idl_demux.c
+++ b/src/idl_demux.c
diff --git a/src/idl_demux.h b/src/idl_demux.h
index 5af9d28..5af9d28 100755..100644
--- a/src/idl_demux.h
+++ b/src/idl_demux.h
diff --git a/src/intl-priv.h b/src/intl-priv.h
index b8a9885..b8a9885 100755..100644
--- a/src/intl-priv.h
+++ b/src/intl-priv.h
diff --git a/src/io-bktr.c b/src/io-bktr.c
index 5976f59..5976f59 100755..100644
--- a/src/io-bktr.c
+++ b/src/io-bktr.c
diff --git a/src/io-dvb.c b/src/io-dvb.c
index 72e43d8..72e43d8 100755..100644
--- a/src/io-dvb.c
+++ b/src/io-dvb.c
diff --git a/src/io-sim.c b/src/io-sim.c
index 962ce12..962ce12 100755..100644
--- a/src/io-sim.c
+++ b/src/io-sim.c
diff --git a/src/io-sim.h b/src/io-sim.h
index b777291..b777291 100755..100644
--- a/src/io-sim.h
+++ b/src/io-sim.h
diff --git a/src/io-v4l.c b/src/io-v4l.c
index 01f9ae2..01f9ae2 100755..100644
--- a/src/io-v4l.c
+++ b/src/io-v4l.c
diff --git a/src/io-v4l2.c b/src/io-v4l2.c
index 837f9e8..837f9e8 100755..100644
--- a/src/io-v4l2.c
+++ b/src/io-v4l2.c
diff --git a/src/io-v4l2k.c b/src/io-v4l2k.c
index cabadc5..cabadc5 100755..100644
--- a/src/io-v4l2k.c
+++ b/src/io-v4l2k.c
diff --git a/src/io.c b/src/io.c
index 184a4e5..184a4e5 100755..100644
--- a/src/io.c
+++ b/src/io.c
diff --git a/src/io.h b/src/io.h
index 77d138b..77d138b 100755..100644
--- a/src/io.h
+++ b/src/io.h
diff --git a/src/lang.c b/src/lang.c
index 9b5442b..9b5442b 100755..100644
--- a/src/lang.c
+++ b/src/lang.c
diff --git a/src/lang.h b/src/lang.h
index 6cc1605..6cc1605 100755..100644
--- a/src/lang.h
+++ b/src/lang.h
diff --git a/src/libzvbi.h b/src/libzvbi.h
index 4f562ee..4f562ee 100755..100644
--- a/src/libzvbi.h
+++ b/src/libzvbi.h
diff --git a/src/macros.h b/src/macros.h
index de9d9fc..de9d9fc 100755..100644
--- a/src/macros.h
+++ b/src/macros.h
diff --git a/src/misc.c b/src/misc.c
index c16c4f9..c16c4f9 100755..100644
--- a/src/misc.c
+++ b/src/misc.c
diff --git a/src/network-table.h b/src/network-table.h
index c883ca2..c883ca2 100755..100644
--- a/src/network-table.h
+++ b/src/network-table.h
diff --git a/src/page_table.c b/src/page_table.c
index 29caf86..29caf86 100755..100644
--- a/src/page_table.c
+++ b/src/page_table.c
diff --git a/src/page_table.h b/src/page_table.h
index 10f2801..10f2801 100755..100644
--- a/src/page_table.h
+++ b/src/page_table.h
diff --git a/src/pdc.h b/src/pdc.h
index 7ff362a..7ff362a 100755..100644
--- a/src/pdc.h
+++ b/src/pdc.h
diff --git a/src/pfc_demux.c b/src/pfc_demux.c
index 3219978..3219978 100755..100644
--- a/src/pfc_demux.c
+++ b/src/pfc_demux.c
diff --git a/src/pfc_demux.h b/src/pfc_demux.h
index a8bb00f..a8bb00f 100755..100644
--- a/src/pfc_demux.h
+++ b/src/pfc_demux.h
diff --git a/src/proxy-client.c b/src/proxy-client.c
index 5baa00d..5baa00d 100755..100644
--- a/src/proxy-client.c
+++ b/src/proxy-client.c
diff --git a/src/proxy-client.h b/src/proxy-client.h
index eb50a6b..eb50a6b 100755..100644
--- a/src/proxy-client.h
+++ b/src/proxy-client.h
diff --git a/src/proxy-msg.c b/src/proxy-msg.c
index b5856e1..b5856e1 100755..100644
--- a/src/proxy-msg.c
+++ b/src/proxy-msg.c
diff --git a/src/proxy-msg.h b/src/proxy-msg.h
index 105a179..105a179 100755..100644
--- a/src/proxy-msg.h
+++ b/src/proxy-msg.h
diff --git a/src/raw_decoder.c b/src/raw_decoder.c
index b42cec5..b42cec5 100755..100644
--- a/src/raw_decoder.c
+++ b/src/raw_decoder.c
diff --git a/src/raw_decoder.h b/src/raw_decoder.h
index e8a1bf2..e8a1bf2 100755..100644
--- a/src/raw_decoder.h
+++ b/src/raw_decoder.h
diff --git a/src/sampling_par.c b/src/sampling_par.c
index 3e39bec..3e39bec 100755..100644
--- a/src/sampling_par.c
+++ b/src/sampling_par.c
diff --git a/src/sampling_par.h b/src/sampling_par.h
index 1cc9bef..1cc9bef 100755..100644
--- a/src/sampling_par.h
+++ b/src/sampling_par.h
diff --git a/src/search.c b/src/search.c
index 1777442..1777442 100755..100644
--- a/src/search.c
+++ b/src/search.c
diff --git a/src/search.h b/src/search.h
index 9728e29..9728e29 100755..100644
--- a/src/search.h
+++ b/src/search.h
diff --git a/src/sliced.h b/src/sliced.h
index d6123a4..d6123a4 100755..100644
--- a/src/sliced.h
+++ b/src/sliced.h
diff --git a/src/sliced_filter.c b/src/sliced_filter.c
index b371584..b371584 100755..100644
--- a/src/sliced_filter.c
+++ b/src/sliced_filter.c
diff --git a/src/sliced_filter.h b/src/sliced_filter.h
index 200d2b7..200d2b7 100755..100644
--- a/src/sliced_filter.h
+++ b/src/sliced_filter.h
diff --git a/src/tables.c b/src/tables.c
index bce2f07..bce2f07 100755..100644
--- a/src/tables.c
+++ b/src/tables.c
diff --git a/src/tables.h b/src/tables.h
index 8228d97..8228d97 100755..100644
--- a/src/tables.h
+++ b/src/tables.h
diff --git a/src/teletext.c b/src/teletext.c
index 837b4bf..04c0a34 100644
--- a/src/teletext.c
+++ b/src/teletext.c
@@ -62,6 +62,10 @@ do {									\
 #define EXT_COLUMNS		41
 #define LAST_ROW		((ROWS - 1) * EXT_COLUMNS)
 
+extern vbi_bool
+_vbi_cache_get_sub_info(vbi_cache *ca, vbi_subno pgno, int *subs, int *len);
+
+
 /*
  *  FLOF navigation
  */
diff --git a/src/teletext_decoder.h b/src/teletext_decoder.h
index f31548f..f31548f 100755..100644
--- a/src/teletext_decoder.h
+++ b/src/teletext_decoder.h
diff --git a/src/trigger.h b/src/trigger.h
index 6582626..6582626 100755..100644
--- a/src/trigger.h
+++ b/src/trigger.h
diff --git a/src/ure.c b/src/ure.c
index 89413d4..89413d4 100755..100644
--- a/src/ure.c
+++ b/src/ure.c
diff --git a/src/ure.h b/src/ure.h
index 0e42e16..0e42e16 100755..100644
--- a/src/ure.h
+++ b/src/ure.h
diff --git a/src/vbi.c b/src/vbi.c
index 687a02f..687a02f 100755..100644
--- a/src/vbi.c
+++ b/src/vbi.c
diff --git a/src/vbi.h b/src/vbi.h
index cbc86d0..cbc86d0 100755..100644
--- a/src/vbi.h
+++ b/src/vbi.h
diff --git a/src/version.h b/src/version.h
index cfb51cb..cfb51cb 100755..100644
--- a/src/version.h
+++ b/src/version.h
diff --git a/src/videodev.h b/src/videodev.h
index b9c1ebb..b9c1ebb 100755..100644
--- a/src/videodev.h
+++ b/src/videodev.h
diff --git a/src/videodev2.h b/src/videodev2.h
index 21e27f2..21e27f2 100755..100644
--- a/src/videodev2.h
+++ b/src/videodev2.h
diff --git a/src/videodev2k.h b/src/videodev2k.h
index f586c73..f586c73 100755..100644
--- a/src/videodev2k.h
+++ b/src/videodev2k.h
diff --git a/src/vps.c b/src/vps.c
index 28f7d38..28f7d38 100755..100644
--- a/src/vps.c
+++ b/src/vps.c
diff --git a/src/vps.h b/src/vps.h
index 722d984..722d984 100755..100644
--- a/src/vps.h
+++ b/src/vps.h
diff --git a/src/vt.h b/src/vt.h
index 3ca0157..3ca0157 100755..100644
--- a/src/vt.h
+++ b/src/vt.h
diff --git a/src/wss.c b/src/wss.c
index 0ea19af..0ea19af 100755..100644
--- a/src/wss.c
+++ b/src/wss.c
diff --git a/src/wss.h b/src/wss.h
index 2419639..2419639 100755..100644
--- a/src/wss.h
+++ b/src/wss.h
diff --git a/src/wstfont2.xbm b/src/wstfont2.xbm
index af717b3..af717b3 100755..100644
--- a/src/wstfont2.xbm
+++ b/src/wstfont2.xbm
diff --git a/src/xds_demux.c b/src/xds_demux.c
index 6324e78..6324e78 100755..100644
--- a/src/xds_demux.c
+++ b/src/xds_demux.c
diff --git a/src/xds_demux.h b/src/xds_demux.h
index 6cdf541..6cdf541 100755..100644
--- a/src/xds_demux.h
+++ b/src/xds_demux.h