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

Merge remote-tracking branch 'origin/pr/340'

Browse source
This commit is contained in:
Adam Sutton 2014-03-13 20:54:24 +00:00
commit a678110453
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input/mpegts/linuxdvb/linuxdvb_frontend.c
View file

@ -631,7 +631,7 @@ linuxdvb_frontend_monitor ( void *aux )
sigstat.snr = mmi->mmi_stats.snr;
sigstat.signal = mmi->mmi_stats.signal;
sigstat.ber = mmi->mmi_stats.ber;
sigstat.unc = mmi->mmi_stats.ber;
sigstat.unc = mmi->mmi_stats.unc;
sm.sm_type = SMT_SIGNAL_STATUS;
sm.sm_data = &sigstat;
LIST_FOREACH(s, &lfe->mi_transports, s_active_link) {

2
src/input/mpegts/linuxdvb/linuxdvb_satconf.c
View file

@ -884,7 +884,7 @@ linuxdvb_satconf_ele_get_priority ( mpegts_input_t *mi )
{
int prio = 0;
linuxdvb_satconf_t *ls = ((linuxdvb_satconf_ele_t*)mi)->ls_parent;
if (!ls->ls_frontend)
if (ls->ls_frontend)
prio = ls->ls_frontend->mi_get_priority(ls->ls_frontend);
return prio + mpegts_input_get_priority(mi);
}

2
src/timeshift/timeshift_reader.c
View file

@ -732,6 +732,7 @@ void *timeshift_reader ( void *p )
((cur_speed > 0) && (sm->sm_time <= deliver))))) {
if (sm->sm_type == SMT_PACKET) {
#if ENABLE_TRACE
th_pkt_t *pkt = sm->sm_data;
tvhtrace("timeshift",
"ts %d pkt out - stream %d type %c pts %10"PRId64
@ -743,6 +744,7 @@ void *timeshift_reader ( void *p )
ts_rescale(pkt->pkt_dts, 1000000),
pkt->pkt_duration,
pktbuf_len(pkt->pkt_payload), sm->sm_time);
#endif
}
streaming_target_deliver2(ts->output, sm);
last_time = sm->sm_time;