[MPlayer-cvslog] r31673 - in trunk: mp_core.h mplayer.c

[reimar]

Author: reimar
Date: Sat Jul 10 20:06:04 2010
New Revision: 31673

Log:
Get rid of useless INITIALIZED_SPUDEC flag.

Modified:
   trunk/mp_core.h
   trunk/mplayer.c

Modified: trunk/mp_core.h
==============================================================================
--- trunk/mp_core.h	Sat Jul 10 19:57:10 2010	(r31672)
+++ trunk/mp_core.h	Sat Jul 10 20:06:04 2010	(r31673)
@@ -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

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sat Jul 10 19:57:10 2010	(r31672)
+++ trunk/mplayer.c	Sat Jul 10 20:06:04 2010	(r31673)
@@ -677,8 +677,7 @@ void uninit_player(unsigned int mask){
     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 update_set_of_subtitles(void)
 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 @@ void init_vo_spudec(void) {
   }
 
   if (vo_spudec!=NULL) {
-    initialized_flags|=INITIALIZED_SPUDEC;
     mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
   }
 }