diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-17 00:07:20 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-17 00:07:20 +0000 |
commit | cf33c343cf60b3f0f24c1b29bb084e77d8fe2b2c (patch) | |
tree | ac53b5931fc9c31855c87c24141dbb98558e4f2d /mplayer.c | |
parent | c8edb9e918fa44821c8e80d936f9da4b2d616a76 (diff) | |
download | mpv-cf33c343cf60b3f0f24c1b29bb084e77d8fe2b2c.tar.bz2 mpv-cf33c343cf60b3f0f24c1b29bb084e77d8fe2b2c.tar.xz |
some small sub bug fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3544 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 24 |
1 files changed, 18 insertions, 6 deletions
@@ -663,13 +663,17 @@ play_next_file: usleep(20000); EventHandling(); } - if(mplShMem->FilenameChanged){ - filename=mplShMem->Filename; - } + #ifdef USE_SUB - sub_name=NULL; - if ( mplShMem->SubtitleChanged ) sub_name=mplShMem->Subtitlename; + if ( mplShMem->SubtitleChanged || !mplShMem->FilenameChanged ) + { sub_name=mplShMem->Subtitlename; mplShMem->SubtitleChanged=0; } #endif + + if ( mplShMem->FilenameChanged || !filename ) + { + filename=mplShMem->Filename; + mplShMem->FilenameChanged=0; + } } #endif @@ -2178,7 +2182,15 @@ if(use_gui || ++curr_filename<num_filenames){ current_module="free_stream"; if(stream) free_stream(stream); - + + current_module="sub_free"; + if ( subtitles ) + { + sub_free( subtitles ); + sub_name=NULL; + vo_sub=NULL; + } + video_out=NULL; audio_out=NULL; |