[Mplayer-cvslog] CVS: main mplayer.c,1.776,1.777

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv28222

Modified Files:
	mplayer.c 
Log Message:
Do not use globals. Put the variables into the appropriate demuxer struct instead.

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.776
retrieving revision 1.777
diff -u -r1.776 -r1.777
--- mplayer.c	24 Aug 2004 20:58:29 -0000	1.776
+++ mplayer.c	24 Aug 2004 21:20:24 -0000	1.777
@@ -3170,12 +3170,12 @@
 	int new_id = dvdsub_id + 1;
 	if (dvdsub_id < 0)
 	    new_id = 0;
-	if ((unsigned int) new_id >= demux_ogg_num_subs())
+	if ((unsigned int) new_id >= demux_ogg_num_subs(demuxer))
 	    new_id = -1;
 	if (new_id != dvdsub_id)
 	    osd_show_vobsub_changed = sh_video->fps;
 	dvdsub_id = new_id;
-	d_dvdsub->id = demux_ogg_sub_id(new_id);
+	d_dvdsub->id = demux_ogg_sub_id(demuxer, new_id);
     }
 #endif
 #ifdef HAVE_MATROSKA