[Mplayer-cvslog] CVS: main mplayer.c,1.770,1.771

[Joey Parrish CVS]

CVS change done by Joey Parrish CVS

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

Modified Files:
	mplayer.c 
Log Message:
forgot some ifdef's and broke mplayer.c without ogg & dvdread
1L to me!


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- mplayer.c	22 Aug 2004 19:01:55 -0000	1.770
+++ mplayer.c	22 Aug 2004 19:34:13 -0000	1.771
@@ -3148,6 +3148,7 @@
 	    osd_show_vobsub_changed = sh_video->fps;
 	vobsub_id = new_id;
     }
+#ifdef USE_DVDREAD
     if (vo_spudec && stream->type == STREAMTYPE_DVD)
     {
 	int new_id = dvdsub_id + 1;
@@ -3160,6 +3161,8 @@
 	d_dvdsub->id = dvdsub_id = new_id;
 	spudec_reset(vo_spudec);
     }
+#endif
+#ifdef HAVE_OGGVORBIS
     if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG)
     {
 	int new_id = dvdsub_id + 1;
@@ -3172,6 +3175,7 @@
 	dvdsub_id = new_id;
 	d_dvdsub->id = demux_ogg_sub_id(new_id);
     }
+#endif
         break;
     case MP_CMD_SUB_FORCED_ONLY:
       if (vo_spudec) {