Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
mpegts service: fix enlist callback for raw (SAT>IP, scan) services, …
…fixes #3746
  • Loading branch information
perexg committed Apr 26, 2016
1 parent 7f24603 commit 1dd5046
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions src/input/mpegts/mpegts_service.c
Expand Up @@ -281,7 +281,7 @@ mpegts_service_config_save ( service_t *t, char *filename, size_t fsize )
* Service instance list
*/
static int
mpegts_service_enlist
mpegts_service_enlist_raw
( service_t *t, tvh_input_t *ti, struct service_instance_list *sil,
int flags, int weight )
{
Expand Down Expand Up @@ -330,6 +330,21 @@ mpegts_service_enlist
return 0;
}

/*
* Service instance list
*/
static int
mpegts_service_enlist
( service_t *t, tvh_input_t *ti, struct service_instance_list *sil,
int flags, int weight )
{
/* invalid PMT */
if (t->s_pmt_pid <= 0 || t->s_pmt_pid >= 8191)
return SM_CODE_INVALID_SERVICE;

return mpegts_service_enlist_raw(t, ti, sil, flags, weight);
}

/*
* Start service
*/
Expand Down Expand Up @@ -1023,7 +1038,7 @@ mpegts_service_create_raw ( mpegts_mux_t *mm )
s->s_delete = mpegts_service_delete;
s->s_is_enabled = mpegts_service_is_enabled;
s->s_config_save = mpegts_service_config_save;
s->s_enlist = mpegts_service_enlist;
s->s_enlist = mpegts_service_enlist_raw;
s->s_start_feed = mpegts_service_start;
s->s_stop_feed = mpegts_service_stop;
s->s_refresh_feed = mpegts_service_refresh;
Expand Down

0 comments on commit 1dd5046

Please sign in to comment.