comparison mplayer.c @ 31607:c593c72884bb

Get rid of useless INITIALIZED_SPUDEC flag.
author reimar
date Sat, 10 Jul 2010 18:06:04 +0000
parents b6c2b541e1a6
children 7fc1f051a19f
comparison
equal deleted inserted replaced
31606:d48795123d88 31607:c593c72884bb
675 current_module="uninit_vobsub"; 675 current_module="uninit_vobsub";
676 if(vo_vobsub) vobsub_close(vo_vobsub); 676 if(vo_vobsub) vobsub_close(vo_vobsub);
677 vo_vobsub=NULL; 677 vo_vobsub=NULL;
678 } 678 }
679 679
680 if (mask&INITIALIZED_SPUDEC){ 680 if (vo_spudec){
681 initialized_flags&=~INITIALIZED_SPUDEC;
682 current_module="uninit_spudec"; 681 current_module="uninit_spudec";
683 spudec_free(vo_spudec); 682 spudec_free(vo_spudec);
684 vo_spudec=NULL; 683 vo_spudec=NULL;
685 } 684 }
686 685
1155 } 1154 }
1156 1155
1157 void init_vo_spudec(void) { 1156 void init_vo_spudec(void) {
1158 if (vo_spudec) 1157 if (vo_spudec)
1159 spudec_free(vo_spudec); 1158 spudec_free(vo_spudec);
1160 initialized_flags &= ~INITIALIZED_SPUDEC;
1161 vo_spudec = NULL; 1159 vo_spudec = NULL;
1162 1160
1163 // we currently can't work without video stream 1161 // we currently can't work without video stream
1164 if (!mpctx->sh_video) 1162 if (!mpctx->sh_video)
1165 return; 1163 return;
1194 vo_spudec=spudec_new_scaled(NULL, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, sh->extradata, sh->extradata_len); 1192 vo_spudec=spudec_new_scaled(NULL, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, sh->extradata, sh->extradata_len);
1195 spudec_set_font_factor(vo_spudec,font_factor); 1193 spudec_set_font_factor(vo_spudec,font_factor);
1196 } 1194 }
1197 1195
1198 if (vo_spudec!=NULL) { 1196 if (vo_spudec!=NULL) {
1199 initialized_flags|=INITIALIZED_SPUDEC;
1200 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx); 1197 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
1201 } 1198 }
1202 } 1199 }
1203 1200
1204 /** 1201 /**