[MPlayer-cvslog] r31918 - trunk/mplayer.c

reimar subversion at mplayerhq.hu
Tue Aug 3 23:06:15 CEST 2010


Author: reimar
Date: Tue Aug  3 23:06:15 2010
New Revision: 31918

Log:
100l, do not free vo_spudec if e.g. just the audio is reinitialized.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Tue Aug  3 19:09:16 2010	(r31917)
+++ trunk/mplayer.c	Tue Aug  3 23:06:15 2010	(r31918)
@@ -664,6 +664,11 @@ void uninit_player(unsigned int mask){
 #ifdef CONFIG_DVDNAV
     mp_dvdnav_context_free(mpctx);
 #endif
+    if (vo_spudec){
+      current_module="uninit_spudec";
+      spudec_free(vo_spudec);
+      vo_spudec=NULL;
+    }
   }
 
   // Must be after libvo uninit, as few vo drivers (svgalib) have tty code.
@@ -682,12 +687,6 @@ void uninit_player(unsigned int mask){
     vo_vobsub=NULL;
   }
 
-  if (vo_spudec){
-    current_module="uninit_spudec";
-    spudec_free(vo_spudec);
-    vo_spudec=NULL;
-  }
-
   if(mask&INITIALIZED_AO){
     initialized_flags&=~INITIALIZED_AO;
     current_module="uninit_ao";


More information about the MPlayer-cvslog mailing list