summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-29 22:24:49 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-29 22:24:49 +0000
commit8a147cf3f099be43ec026426ca87be4f18356025 (patch)
treeb27c0273fa585236f49524ab04a40168c4aadebd /mplayer.c
parent354fc0e75c95dc3d920c1cd8e37880d05fd2f42e (diff)
downloadmpv-8a147cf3f099be43ec026426ca87be4f18356025.tar.bz2
mpv-8a147cf3f099be43ec026426ca87be4f18356025.tar.xz
- add play time subtitle change support
- better language support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7151 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/mplayer.c b/mplayer.c
index e7fb868c3a..d2267365e1 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -251,6 +251,10 @@ int sub_auto = 1;
char *vobsub_name=NULL;
/*DSP!!char *dsp=NULL;*/
int subcc_enabled=0;
+#ifdef USE_SUB
+subtitle* subtitles=NULL;
+float sub_last_pts = -303;
+#endif
extern char *vo_subdevice;
extern char *ao_subdevice;
@@ -467,10 +471,6 @@ static int libmpdemux_was_interrupted(int eof) {
int main(int argc,char* argv[], char *envp[]){
-#ifdef USE_SUB
-static subtitle* subtitles=NULL;
-float sub_last_pts = -303;
-#endif
static demux_stream_t *d_audio=NULL;
static demux_stream_t *d_video=NULL;
@@ -2803,6 +2803,7 @@ if(use_gui || playtree_iter != NULL){
if ( subtitles )
{
sub_free( subtitles );
+ if ( sub_name ) free( sub_name );
sub_name=NULL;
vo_sub=NULL;
subtitles=NULL;