[Mplayer-cvslog] CVS: main mplayer.c,1.658,1.659

Arpi of Ize arpi at mplayerhq.hu
Mon Jan 20 23:50:09 CET 2003


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

Modified Files:
	mplayer.c 
Log Message:
1000l


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -r1.658 -r1.659
--- mplayer.c	20 Jan 2003 21:28:05 -0000	1.658
+++ mplayer.c	20 Jan 2003 22:49:50 -0000	1.659
@@ -401,18 +401,6 @@
     vo_spudec=NULL;
   }
 
-#ifdef USE_SUB  
-  if ( subtitles ) 
-   {
-    current_module="sub_free";
-    sub_free( subtitles );
-    if ( sub_name ) free( sub_name );
-    sub_name=NULL;
-    vo_sub=NULL;
-    subtitles=NULL;
-   }
-#endif
-
   if(mask&INITED_AO){
     inited_flags&=~INITED_AO;
     current_module="uninit_ao";
@@ -3258,6 +3246,18 @@
 
 // time to uninit all, except global stuff:
 uninit_player(INITED_ALL-(INITED_GUI+INITED_INPUT+(fixed_vo?INITED_VO:0)));
+
+#ifdef USE_SUB  
+  if ( subtitles ) 
+   {
+    current_module="sub_free";
+    sub_free( subtitles );
+    if ( sub_name ) free( sub_name );
+    sub_name=NULL;
+    vo_sub=NULL;
+    subtitles=NULL;
+   }
+#endif
 
 if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) {
   eof = eof == PT_NEXT_ENTRY ? 1 : -1;



More information about the MPlayer-cvslog mailing list