Mercurial > mplayer.hg

comparison mplayer.c @ 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 46c25393f99d
children e30fe0cb79cd
comparison
equal deleted inserted replaced
31838:31ece8c6baed 31839:5edb6679ccad
662 mpctx->video_out->uninit(); 662 mpctx->video_out->uninit();
663 mpctx->video_out=NULL; 663 mpctx->video_out=NULL;
664 #ifdef CONFIG_DVDNAV 664 #ifdef CONFIG_DVDNAV
665 mp_dvdnav_context_free(mpctx); 665 mp_dvdnav_context_free(mpctx);
666 #endif 666 #endif
667 if (vo_spudec){
668 current_module="uninit_spudec";
669 spudec_free(vo_spudec);
670 vo_spudec=NULL;
671 }
667 } 672 }
668 673
669 // Must be after libvo uninit, as few vo drivers (svgalib) have tty code. 674 // Must be after libvo uninit, as few vo drivers (svgalib) have tty code.
670 if(mask&INITIALIZED_GETCH2){ 675 if(mask&INITIALIZED_GETCH2){
671 initialized_flags&=~INITIALIZED_GETCH2; 676 initialized_flags&=~INITIALIZED_GETCH2;
678 if(mask&INITIALIZED_VOBSUB){ 683 if(mask&INITIALIZED_VOBSUB){
679 initialized_flags&=~INITIALIZED_VOBSUB; 684 initialized_flags&=~INITIALIZED_VOBSUB;
680 current_module="uninit_vobsub"; 685 current_module="uninit_vobsub";
681 if(vo_vobsub) vobsub_close(vo_vobsub); 686 if(vo_vobsub) vobsub_close(vo_vobsub);
682 vo_vobsub=NULL; 687 vo_vobsub=NULL;
683 }
684
685 if (vo_spudec){
686 current_module="uninit_spudec";
687 spudec_free(vo_spudec);
688 vo_spudec=NULL;
689 } 688 }
690 689
691 if(mask&INITIALIZED_AO){ 690 if(mask&INITIALIZED_AO){
692 initialized_flags&=~INITIALIZED_AO; 691 initialized_flags&=~INITIALIZED_AO;
693 current_module="uninit_ao"; 692 current_module="uninit_ao";