ability to disable the nonsense expand filter is a must! otherwise

it's impossible to render subtitles earlier in the filter chain and
then scale them down with a scale filter; huge subs will get rendered
again on top!! (think dvd/vobsub where you can't just use smaller font
size) if anyone has a better way to handle this, do it! (e.g. make it
so that the first expand filter disabled osd for the rest of the
filter chain)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9077 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rfelker 2003-01-24 01:04:50 +00:00
parent 531d63b5b9
commit c8091743e1
2 changed files with 6 additions and 1 deletions

View File

@ -180,6 +180,9 @@ static config_t mencoder_opts[]={
{"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
{"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL},
// info header strings
{"info", info_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},

View File

@ -172,6 +172,8 @@ static subtitle* subtitles=NULL;
float sub_last_pts = -303;
#endif
int auto_expand=1;
// infos are empty by default
char *info_name=NULL;
char *info_artist=NULL;
@ -675,7 +677,7 @@ default:
mencoder_exit(1,NULL);
}
// append 'expand' filter, it fixes stride problems and renders osd:
sh_video->vfilter=vf_open_filter(sh_video->vfilter,"expand","-1:-1:-1:-1:1");
if (auto_expand) sh_video->vfilter=vf_open_filter(sh_video->vfilter,"expand","-1:-1:-1:-1:1");
sh_video->vfilter=append_filters(sh_video->vfilter);
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");