[Mplayer-cvslog] CVS: main mplayer.c,1.451,1.452

Arpi of Ize arpi at mplayer.dev.hu
Sun Mar 31 04:22:42 CEST 2002


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv28982

Modified Files:
	mplayer.c 
Log Message:
1 step closed to solving memory corruptions

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- mplayer.c	30 Mar 2002 23:18:40 -0000	1.451
+++ mplayer.c	31 Mar 2002 02:22:40 -0000	1.452
@@ -306,6 +306,7 @@
     inited_flags&=~INITED_SPUDEC;
     current_module="uninit_spudec";
     spudec_free(vo_spudec);
+    vo_spudec=NULL;
   }
 #endif
   if(mask&INITED_VO){
@@ -1120,10 +1121,10 @@
 current_module="spudec_init";
 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL,
 			    sh_video->disp_w, sh_video->disp_h);
-if (vo_spudec!=NULL)
-  inited_flags|=INITED_SPUDEC;
 }
 #endif
+if (vo_spudec!=NULL)
+  inited_flags|=INITED_SPUDEC;
 
 #ifdef USE_SUB
 // after reading video params we should load subtitles because
@@ -2789,12 +2790,15 @@
 
   current_module="uninit_vcodec";
   if(sh_video) uninit_video(sh_video);
+  sh_video=NULL;
   
   current_module="free_demuxer";
   if(demuxer) free_demuxer(demuxer);
+  demuxer=NULL;
 
   current_module="free_stream";
   if(stream) free_stream(stream);
+  stream=NULL;
   
   current_module="sub_free";
   if ( subtitles ) 




More information about the MPlayer-cvslog mailing list