From c8091743e16de84e3c59890aed97bcdb62189270 Mon Sep 17 00:00:00 2001 From: rfelker Date: Fri, 24 Jan 2003 01:04:50 +0000 Subject: [PATCH] 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 --- cfg-mencoder.h | 3 +++ mencoder.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cfg-mencoder.h b/cfg-mencoder.h index b4ca66e5dd..11cd137b81 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -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}, diff --git a/mencoder.c b/mencoder.c index 191aa0724c..fcf25fbb10 100644 --- a/mencoder.c +++ b/mencoder.c @@ -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");