vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Feb 18 19:35:22 2015 +0200| [fd0970abdfc80fe92cf6b87ed6b6987526919035] | committer: Rémi Denis-Courmont
DTV: DVB-T2 PLP ID is between 0 and 255 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fd0970abdfc80fe92cf6b87ed6b6987526919035 --- modules/access/dtv/access.c | 2 +- modules/access/dtv/bdagraph.cpp | 2 +- modules/access/dtv/dtv.h | 2 +- modules/access/dtv/linux.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c index 95b1dd7..11f93a6 100644 --- a/modules/access/dtv/access.c +++ b/modules/access/dtv/access.c @@ -301,7 +301,7 @@ vlc_module_begin () change_integer_list (hierarchy_vlc, hierarchy_user) change_safe () add_integer ("dvb-plp-id", 0, PLP_ID_TEXT, PLP_ID_TEXT, false) - change_integer_range (0, 0xFFFFFFFF) + change_integer_range (0, 255) change_safe () set_section (N_("ISDB-T reception parameters"), NULL) diff --git a/modules/access/dtv/bdagraph.cpp b/modules/access/dtv/bdagraph.cpp index 3a8ef30..507f6ea 100644 --- a/modules/access/dtv/bdagraph.cpp +++ b/modules/access/dtv/bdagraph.cpp @@ -238,7 +238,7 @@ int dvb_set_dvbt (dvb_device_t *d, uint32_t freq, const char * /*mod*/, /* DVB-T2 */ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char * /*mod*/, uint32_t fec, uint32_t bandwidth, int transmission, - uint32_t guard, uint32_t plp) + uint32_t guard, uint8_t plp) { return d->module->SetDVBT2(freq / 1000, fec, bandwidth, transmission, guard, plp); diff --git a/modules/access/dtv/dtv.h b/modules/access/dtv/dtv.h index 6d85924..8a3b2fb 100644 --- a/modules/access/dtv/dtv.h +++ b/modules/access/dtv/dtv.h @@ -85,7 +85,7 @@ int dvb_set_dvbt (dvb_device_t *, uint32_t freq, const char *mod, int transmission, uint32_t guard, int hierarchy); int dvb_set_dvbt2 (dvb_device_t *, uint32_t freq, const char *mod, uint32_t fec, uint32_t bandwidth, - int transmission, uint32_t guard, uint32_t plp); + int transmission, uint32_t guard, uint8_t plp); /* ATSC */ int dvb_set_atsc (dvb_device_t *, uint32_t freq, const char *mod); diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c index f382462..4f369c0 100644 --- a/modules/access/dtv/linux.c +++ b/modules/access/dtv/linux.c @@ -1004,7 +1004,7 @@ int dvb_set_dvbt (dvb_device_t *d, uint32_t freq, const char *modstr, int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr, uint32_t fec, uint32_t bandwidth, - int transmit_mode, uint32_t guard, uint32_t plp) + int transmit_mode, uint32_t guard, uint8_t plp) { #if DVBv5(3) uint32_t mod = dvb_parse_modulation (modstr, QAM_AUTO); @@ -1025,7 +1025,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr, # else DTV_DVBT2_PLP_ID, # endif - plp); + (uint32_t)plp); #else # warning DVB-T2 needs Linux DVB version 5.3 or later. msg_Err (d->obj, "DVB-T2 support not compiled-in"); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
