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

[nicodvb]

Author: nicodvb
Date: Tue Jan 30 00:10:01 2007
New Revision: 22067

Modified:
   trunk/libmpdemux/demux_ts.c

Log:
5l, check that the codec type detected by ts_detect_streams() is actually audio before fixing it in the array

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	(original)
+++ trunk/libmpdemux/demux_ts.c	Tue Jan 30 00:10:01 2007
@@ -1010,7 +1010,7 @@
 	{
 		ES_stream_t *es = priv->ts.pids[params.apid]; 
 		
-		if(!IS_AUDIO(es->type) && !IS_AUDIO(es->subtype)) es->subtype = params.atype;
+		if(!IS_AUDIO(es->type) && !IS_AUDIO(es->subtype) && IS_AUDIO(params.atype)) es->subtype = params.atype;
 		ts_add_stream(demuxer, priv->ts.pids[params.apid]);
 		sh_audio = priv->ts.streams[params.apid].sh;
 		demuxer->audio->id = priv->ts.streams[params.apid].id;