[MPlayer-cvslog] CVS: main mplayer.c,1.899,1.900

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	mplayer.c 
Log Message:
don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect) 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -r1.899 -r1.900
--- mplayer.c	31 Dec 2005 07:37:37 -0000	1.899
+++ mplayer.c	2 Jan 2006 20:40:24 -0000	1.900
@@ -3794,8 +3794,10 @@
         vo_sub_last = vo_sub = NULL;
 #endif
         vobsub_id = -1;
+	if(dvdsub_lang) {
         dvdsub_id = -1;
         if (d_dvdsub) d_dvdsub->id = -1;
+	}
 
         // be careful!
         // if sub_changed is till on but subdata's been reset, bad things happen.