# HG changeset patch
# User rfelker
# Date 1043370290 0
# Node ID 92014b66ed3d14435fe6fb85e2c73a67a9e3153c
# Parent  5e51d85f7a4d3ae3970f08930732542633179d1d
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)

diff -r 5e51d85f7a4d -r 92014b66ed3d cfg-mencoder.h
--- a/cfg-mencoder.h	Thu Jan 23 22:21:30 2003 +0000
+++ b/cfg-mencoder.h	Fri Jan 24 01:04:50 2003 +0000
@@ -180,6 +180,9 @@
 	{"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 -r 5e51d85f7a4d -r 92014b66ed3d mencoder.c
--- a/mencoder.c	Thu Jan 23 22:21:30 2003 +0000
+++ b/mencoder.c	Fri Jan 24 01:04:50 2003 +0000
@@ -172,6 +172,8 @@
 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 @@
         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");