From 2158f1b4017b25bffc0cc72b4fc83d6fbafd8572 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Wed, 6 Oct 2010 17:37:50 +0000 Subject: demux_ts: fix subtitle stream breaking audio track switch Fix switching audio track with the native MPEG-TS demuxer after an additional subtitle stream was detected. Patch by KS Ng, hk D dmbth A gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32445 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ts.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libmpdemux/demux_ts.c') diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index ce79c166cd..643a00075c 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -56,6 +56,7 @@ #define TYPE_AUDIO 1 #define TYPE_VIDEO 2 +#define TYPE_SUB 3 int ts_prog; int ts_keep_broken=0; @@ -412,9 +413,9 @@ static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es) case SPU_PGS: sh->type = 'p'; break; } - priv->ts.streams[es->pid].id = priv->last_aid; + priv->ts.streams[es->pid].id = priv->last_sid; priv->ts.streams[es->pid].sh = sh; - priv->ts.streams[es->pid].type = TYPE_AUDIO; + priv->ts.streams[es->pid].type = TYPE_SUB; priv->last_sid++; } } -- cgit v1.2.3