From a3f0ecd91fc3ea668966dcaf2b852f72223b8155 Mon Sep 17 00:00:00 2001 From: arpi Date: Mon, 20 Jan 2003 22:49:50 +0000 Subject: 1000l git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9049 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 121e9039e6..2448174b7d 100644 --- a/mplayer.c +++ b/mplayer.c @@ -401,18 +401,6 @@ static void uninit_player(unsigned int mask){ 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 @@ if(benchmark){ // 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) { -- cgit v1.2.3