vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Nov 24 17:49:43 2012 +0200| [cd1e58d9d37bc97bd4981faaa075e9d13c75bc3b] | committer: Rémi Denis-Courmont
dtv: fix compilation with Linux 3.7 / DVB >= 5.8 (fixes #7763) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cd1e58d9d37bc97bd4981faaa075e9d13c75bc3b --- modules/access/dtv/linux.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c index 02c7752..b7ddb9b 100644 --- a/modules/access/dtv/linux.c +++ b/modules/access/dtv/linux.c @@ -990,7 +990,12 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr, DTV_INNER_FEC, fec, DTV_BANDWIDTH_HZ, bandwidth, DTV_TRANSMISSION_MODE, transmit_mode, DTV_GUARD_INTERVAL, guard, - DTV_DVBT2_PLP_ID, plp); +# if DVBv5(8) + DTV_STREAM_ID, +# else + DTV_DVBT2_PLP_ID, +# endif + plp); #else # warning DVB-T2 needs Linux DVB version 5.3 or later. msg_Err (d->obj, "DVB-T2 support not compiled-in"); @@ -1031,7 +1036,12 @@ int dvb_set_isdbs (dvb_device_t *d, uint64_t freq_Hz, uint16_t ts_id) return -1; return dvb_set_props (d, 5, DTV_CLEAR, 0, DTV_DELIVERY_SYSTEM, SYS_ISDBS, DTV_FREQUENCY, freq, - DTV_ISDBS_TS_ID, (uint32_t)ts_id); +#if DVBv5(8) + DTV_STREAM_ID, +#else + DTV_ISDBS_TS_ID, +#endif + (uint32_t)ts_id); } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
