summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-10-06 17:37:50 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:18:08 +0200
commit2158f1b4017b25bffc0cc72b4fc83d6fbafd8572 (patch)
treef8f36beb40cde848c4a914b00b06b2bc9944f853 /libmpdemux
parentabca2a253ed5bc405448d7bcb721999fa6dba8a6 (diff)
downloadmpv-2158f1b4017b25bffc0cc72b4fc83d6fbafd8572.tar.bz2
mpv-2158f1b4017b25bffc0cc72b4fc83d6fbafd8572.tar.xz
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
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_ts.c5
1 files changed, 3 insertions, 2 deletions
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++;
}
}