summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-31 02:22:40 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-31 02:22:40 +0000
commit23911100dbb7f4ccd266e22feedd2767baee292c (patch)
tree432bc16bbe09bcd18a4db7cab35cbaec7704d489 /mplayer.c
parent6ad9ef57e3a84c27d006ea147b4e84d8cdb1e74e (diff)
downloadmpv-23911100dbb7f4ccd266e22feedd2767baee292c.tar.bz2
mpv-23911100dbb7f4ccd266e22feedd2767baee292c.tar.xz
1 step closed to solving memory corruptions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5412 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index c05cebb755..b1dd5417a7 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -306,6 +306,7 @@ void uninit_player(unsigned int mask){
inited_flags&=~INITED_SPUDEC;
current_module="uninit_spudec";
spudec_free(vo_spudec);
+ vo_spudec=NULL;
}
#endif
if(mask&INITED_VO){
@@ -1120,10 +1121,10 @@ if (vo_spudec==NULL) {
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 @@ if(use_gui || playtree_iter != NULL
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 )