summaryrefslogtreecommitdiffstats
path: root/demux/demux_ts.c
diff options
context:
space:
mode:
Diffstat (limited to 'demux/demux_ts.c')
-rw-r--r--demux/demux_ts.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/demux/demux_ts.c b/demux/demux_ts.c
index 42da41d532..8b2a2d84ba 100644
--- a/demux/demux_ts.c
+++ b/demux/demux_ts.c
@@ -415,11 +415,11 @@ static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es)
if (sh) {
switch (es->type) {
case SPU_DVB:
- sh->type = 'b'; break;
+ sh->gsh->codec = "dvb_subtitle"; break;
case SPU_DVD:
- sh->type = 'v'; break;
+ sh->gsh->codec = "dvd_subtitle"; break;
case SPU_PGS:
- sh->type = 'p'; break;
+ sh->gsh->codec = "hdmv_pgs_subtitle"; break;
}
priv->ts.streams[es->pid].id = priv->last_sid;
priv->ts.streams[es->pid].sh = sh;
@@ -1024,11 +1024,6 @@ static demuxer_t *demux_open_ts(demuxer_t * demuxer)
demuxer->priv = priv;
- if(demuxer->stream->type != STREAMTYPE_FILE)
- demuxer->seekable = 1;
- else
- demuxer->seekable = 1;
-
params.atype = params.vtype = params.stype = UNKNOWN;
params.apid = demuxer->audio->id;
@@ -2986,7 +2981,7 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
{
sh_sub_t *sh_sub = demuxer->sub->sh;
- if(sh_sub && sh_sub->sid == tss->pid)
+ if(sh_sub && sh_sub->gsh->demuxer_id == tss->pid)
{
ds = demuxer->sub;