RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Set the forced_subs_only value correctly whenever a new spudec is created. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29108 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-03-30 17:05:39 +00:00
parent e0fb449076
commit 74e6fb2c01
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mencoder.c
View File

@ -698,6 +698,8 @@ vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream-
sh_video->disp_w, sh_video->disp_h, NULL, 0); sh_video->disp_w, sh_video->disp_h, NULL, 0);
} }
#endif #endif
if (vo_spudec)
spudec_set_forced_subs_only(vo_spudec, forced_subs_only);
} }
ostream = open_output_stream(out_filename, 0); ostream = open_output_stream(out_filename, 0);

5
mplayer.c
View File

@ -1125,8 +1125,10 @@ void init_vo_spudec(void) {
spudec_set_font_factor(vo_spudec,font_factor); spudec_set_font_factor(vo_spudec,font_factor);
} }
if (vo_spudec!=NULL) if (vo_spudec!=NULL) {
initialized_flags|=INITIALIZED_SPUDEC; initialized_flags|=INITIALIZED_SPUDEC;
mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
}
} }
/* /*
@ -3066,6 +3068,7 @@ if (edl_output_filename) {
if(vo_vobsub){ if(vo_vobsub){
initialized_flags|=INITIALIZED_VOBSUB; initialized_flags|=INITIALIZED_VOBSUB;
vobsub_set_from_lang(vo_vobsub, dvdsub_lang); vobsub_set_from_lang(vo_vobsub, dvdsub_lang);
mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
// setup global sub numbering // setup global sub numbering
mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] = mpctx->global_sub_size; // the global # of the first vobsub. mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] = mpctx->global_sub_size; // the global # of the first vobsub.