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

[nicodvb]

Author: nicodvb
Date: Thu Nov 16 23:08:14 2006
New Revision: 20970

Modified:
   trunk/libmpdemux/demux_ts.c

Log:
restored circular looping when changing audio and video stream (previously broken)

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	(original)
+++ trunk/libmpdemux/demux_ts.c	Thu Nov 16 23:08:14 2006
@@ -3189,10 +3189,12 @@
 				while(!sh_a)
 				{
 					i = (i+1) % 8192;
+					if(priv->ts.streams[i].type == TYPE_AUDIO)
+					{
 					if(priv->ts.streams[i].id == demuxer->audio->id)	//we made a complete loop
 						break;
-					if(priv->ts.streams[i].type == TYPE_AUDIO)
 						sh_a = (sh_audio_t*)priv->ts.streams[i].sh;
+					}
 				}
 			}
 			else if(n <= priv->last_aid)
@@ -3241,10 +3243,12 @@
 				while(!sh_v)
 				{
 					i = (i+1) % 8192;
+					if(priv->ts.streams[i].type == TYPE_VIDEO)
+					{
 					if(priv->ts.streams[i].id == demuxer->video->id)	//we made a complete loop
 						break;
-					if(priv->ts.streams[i].type == TYPE_VIDEO)
 						sh_v = (sh_video_t*)priv->ts.streams[i].sh;
+					}
 				}
 			}
 			else if(n <= priv->last_vid)