changeset 10216:d608097901b1

changed the silly func-inside-func codepice
author alex
date Fri, 30 May 2003 18:30:24 +0000
parents dd32fe16a36c
children 1f3935c55e6f
files mplayer.c
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Fri May 30 18:23:55 2003 +0000
+++ b/mplayer.c	Fri May 30 18:30:24 2003 +0000
@@ -3388,9 +3388,11 @@
   // DVD sub:
 if(vo_config_count && vo_spudec) {
   unsigned char* packet=NULL;
-  int len,timestamp;
+  int len=1,timestamp;
+  current_module="spudec";
+  spudec_heartbeat(vo_spudec,90000*sh_video->timer);
     // Get a sub packet from the dvd or a vobsub and make a timestamp relative to sh_video->timer
-  int get_sub_packet(void) {
+  while(len>0 && packet){
     // Vobsub
     len = 0;
     if(vo_vobsub) {
@@ -3410,11 +3412,6 @@
 	mp_dbg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d  v_pts=%5.3f  s_pts=%5.3f  ts=%d \n",len,sh_video->pts,d_dvdsub->pts,timestamp);
       }
     }
-    return len;
-  }
-  current_module="spudec";
-  spudec_heartbeat(vo_spudec,90000*sh_video->timer);
-  while(get_sub_packet()>0 && packet){
       if(timestamp < 0) timestamp = 0;
       spudec_assemble(vo_spudec,packet,len,timestamp);
   }