Mercurial > mplayer.hg

changeset 31839:5edb6679ccad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
100l, do not free vo_spudec if e.g. just the audio is reinitialized.
author reimar
date Tue, 03 Aug 2010 21:06:15 +0000
parents 31ece8c6baed
children af68430bf5de
files mplayer.c
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Tue Aug 03 17:09:16 2010 +0000
+++ b/mplayer.c	Tue Aug 03 21:06:15 2010 +0000
@@ -664,6 +664,11 @@
 #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 @@
     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";