mirror of
https://github.com/mpv-player/mpv
synced 2025-03-23 20:00:56 +00:00
1 step closed to solving memory corruptions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5412 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
6ad9ef57e3
commit
23911100db
@ -306,6 +306,7 @@ void uninit_player(unsigned int mask){
|
|||||||
inited_flags&=~INITED_SPUDEC;
|
inited_flags&=~INITED_SPUDEC;
|
||||||
current_module="uninit_spudec";
|
current_module="uninit_spudec";
|
||||||
spudec_free(vo_spudec);
|
spudec_free(vo_spudec);
|
||||||
|
vo_spudec=NULL;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if(mask&INITED_VO){
|
if(mask&INITED_VO){
|
||||||
@ -1120,10 +1121,10 @@ if (vo_spudec==NULL) {
|
|||||||
current_module="spudec_init";
|
current_module="spudec_init";
|
||||||
vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL,
|
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);
|
sh_video->disp_w, sh_video->disp_h);
|
||||||
if (vo_spudec!=NULL)
|
|
||||||
inited_flags|=INITED_SPUDEC;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
if (vo_spudec!=NULL)
|
||||||
|
inited_flags|=INITED_SPUDEC;
|
||||||
|
|
||||||
#ifdef USE_SUB
|
#ifdef USE_SUB
|
||||||
// after reading video params we should load subtitles because
|
// after reading video params we should load subtitles because
|
||||||
@ -2789,12 +2790,15 @@ if(use_gui || playtree_iter != NULL
|
|||||||
|
|
||||||
current_module="uninit_vcodec";
|
current_module="uninit_vcodec";
|
||||||
if(sh_video) uninit_video(sh_video);
|
if(sh_video) uninit_video(sh_video);
|
||||||
|
sh_video=NULL;
|
||||||
|
|
||||||
current_module="free_demuxer";
|
current_module="free_demuxer";
|
||||||
if(demuxer) free_demuxer(demuxer);
|
if(demuxer) free_demuxer(demuxer);
|
||||||
|
demuxer=NULL;
|
||||||
|
|
||||||
current_module="free_stream";
|
current_module="free_stream";
|
||||||
if(stream) free_stream(stream);
|
if(stream) free_stream(stream);
|
||||||
|
stream=NULL;
|
||||||
|
|
||||||
current_module="sub_free";
|
current_module="sub_free";
|
||||||
if ( subtitles )
|
if ( subtitles )
|
||||||
|
Loading…
Reference in New Issue
Block a user