Mercurial > mplayer.hg

changeset 9048:c0eab5d768c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1000l
author arpi
date Mon, 20 Jan 2003 22:49:50 +0000
parents 8c3d54868366
children ce5d2df8db5a
files mplayer.c
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Mon Jan 20 21:35:31 2003 +0000
+++ b/mplayer.c	Mon Jan 20 22:49:50 2003 +0000
@@ -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";
@@ -3259,6 +3247,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;
   if(play_tree_iter_step(playtree_iter,play_tree_step,0) == PLAY_TREE_ITER_ENTRY) {