# HG changeset patch # User cehoyos # Date 1286386670 0 # Node ID 3f8dcfb958451b8f2ba367ca184f3e905e832dce # Parent 29dc134ae9b35f5ddd1faafbda35047b83837714 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 diff -r 29dc134ae9b3 -r 3f8dcfb95845 libmpdemux/demux_ts.c --- a/libmpdemux/demux_ts.c Tue Oct 05 20:51:05 2010 +0000 +++ b/libmpdemux/demux_ts.c Wed Oct 06 17:37:50 2010 +0000 @@ -57,6 +57,7 @@ #define TYPE_AUDIO 1 #define TYPE_VIDEO 2 +#define TYPE_SUB 3 int ts_prog; int ts_keep_broken=0; @@ -410,9 +411,9 @@ 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++; } }