[MPlayer-cvslog] r32445 - trunk/libmpdemux/demux_ts.c

[cehoyos]

Author: cehoyos
Date: Wed Oct  6 19:37:50 2010
New Revision: 32445

Log:
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

Modified:
   trunk/libmpdemux/demux_ts.c

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Tue Oct  5 22:51:05 2010	(r32444)
+++ trunk/libmpdemux/demux_ts.c	Wed Oct  6 19:37:50 2010	(r32445)
@@ -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 @@ static void ts_add_stream(demuxer_t * de
 			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++;
 		}
 	}