[Mplayer-cvslog] CVS: main mplayer.c,1.596,1.597

[Kim Minh Kaplan CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv22234

Modified Files:
	mplayer.c 
Log Message:
10L


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- mplayer.c	17 Oct 2002 15:44:41 -0000	1.596
+++ mplayer.c	19 Oct 2002 01:58:34 -0000	1.597
@@ -1085,7 +1085,7 @@
   unsigned int palette[16], width, height;
   current_module="spudec_init_vobsub";
   if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)
-    vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h);
+    vo_spudec=spudec_new_scaled(palette, width, height);
 }
 
 #ifdef USE_DVDNAV
@@ -2209,6 +2209,7 @@
 	break;
     }
     case MP_CMD_VOBSUB_LANG:
+    if (vo_vobsub)
     {
 	int new_id = vobsub_id + 1;
 	if (vobsub_id < 0)
@@ -2590,7 +2591,7 @@
       } else
       if (osd_show_vobsub_changed) {
 	  const char *language = "none";
-	  if (vobsub_id >= 0)
+	  if (vo_vobsub && vobsub_id >= 0)
 	      language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id);
 	  sprintf(osd_text_tmp, "Subtitles: (%d) %s", vobsub_id, language ? language : "unknown");
 	  osd_show_vobsub_changed--;