Mercurial > mplayer.hg

changeset 31607:c593c72884bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of useless INITIALIZED_SPUDEC flag.
author reimar
date Sat, 10 Jul 2010 18:06:04 +0000
parents d48795123d88
children ad007a37ae4e
files mp_core.h mplayer.c
diffstat 2 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mp_core.h	Sat Jul 10 17:57:10 2010 +0000
+++ b/mp_core.h	Sat Jul 10 18:06:04 2010 +0000
@@ -35,7 +35,6 @@
 #define INITIALIZED_AO      2
 #define INITIALIZED_GUI     4
 #define INITIALIZED_GETCH2  8
-#define INITIALIZED_SPUDEC  32
 #define INITIALIZED_STREAM  64
 #define INITIALIZED_INPUT   128
 #define INITIALIZED_VOBSUB  256
--- a/mplayer.c	Sat Jul 10 17:57:10 2010 +0000
+++ b/mplayer.c	Sat Jul 10 18:06:04 2010 +0000
@@ -677,8 +677,7 @@
     vo_vobsub=NULL;
   }
 
-  if (mask&INITIALIZED_SPUDEC){
-    initialized_flags&=~INITIALIZED_SPUDEC;
+  if (vo_spudec){
     current_module="uninit_spudec";
     spudec_free(vo_spudec);
     vo_spudec=NULL;
@@ -1157,7 +1156,6 @@
 void init_vo_spudec(void) {
   if (vo_spudec)
     spudec_free(vo_spudec);
-  initialized_flags &= ~INITIALIZED_SPUDEC;
   vo_spudec = NULL;
 
   // we currently can't work without video stream
@@ -1196,7 +1194,6 @@
   }
 
   if (vo_spudec!=NULL) {
-    initialized_flags|=INITIALIZED_SPUDEC;
     mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
   }
 }