[Mplayer-cvslog] CVS: main mencoder.c,1.120,1.121

[Arpi of Ize]

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

Modified Files:
	mencoder.c 
Log Message:
DVD subs fixed

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- mencoder.c	17 Apr 2002 21:51:17 -0000	1.120
+++ mencoder.c	17 Apr 2002 22:17:32 -0000	1.121
@@ -937,19 +937,6 @@
 
 } // demuxer2
 
-#ifdef USE_DVDREAD
-// DVD sub:
- if(vo_spudec){
-     unsigned char* packet=NULL;
-     int len;
-     while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
-	 mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d  v_pts=%5.3f  s_pts=%5.3f  \n",len,d_video->pts,d_dvdsub->pts);
-	 spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts);
-     }
-     spudec_heartbeat(vo_spudec,90000*d_video->pts);
- }
-#endif
-
 ptimer_start = GetTimerMS();
 
 switch(mux_v->codec){
@@ -1098,6 +1085,7 @@
 	 spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts);
      }
      spudec_heartbeat(vo_spudec,90000*d_video->pts);
+     vo_osd_changed(OSDTYPE_SPU);
  }
 #endif