stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mpegts dvb: fix the DVB-S mux initialization - wrong position value

Browse source
This commit is contained in:
Jaroslav Kysela 2015-02-08 20:30:56 +01:00
parent 3396fe7a4b
commit a6ac407dbf
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/input/mpegts/dvb_support.c
View file

@ -778,6 +778,13 @@ dvb_mux_conf_init ( dvb_mux_conf_t *dmc, dvb_fe_delivery_system_t delsys )
dmc->dmc_fe_inversion = DVB_INVERSION_AUTO;
dmc->dmc_fe_pilot = DVB_PILOT_AUTO;
dmc->dmc_fe_stream_id = DVB_NO_STREAM_ID_FILTER;
switch (dmc->dmc_fe_type) {
case DVB_TYPE_S:
dmc->u.dmc_fe_qpsk.orbital_pos = INT_MAX;
break;
default:
break;
}
}

7
src/input/mpegts/mpegts_mux_dvb.c
View file

@ -452,7 +452,10 @@ dvb_mux_dvbs_class_orbital_get ( void *o )
{
static char buf[16], *s = buf;
dvb_mux_t *lm = o;
dvb_sat_position_to_str(lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos, buf, sizeof(buf));
if (lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos == INT_MAX)
buf[0] = '\0';
else
dvb_sat_position_to_str(lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos, buf, sizeof(buf));
return &s;
}
@ -696,7 +699,7 @@ dvb_mux_create0
lm = (dvb_mux_t*)mm;
/* Defaults */
dvb_mux_conf_init(&lm->lm_tuning, DVB_SYS_NONE);
dvb_mux_conf_init(&lm->lm_tuning, ln->ln_type);
/* Parent init and load config */
if (!(mm = mpegts_mux_create0(mm, idc, uuid,