[Mplayer-cvslog] CVS: main cfg-mencoder.h,1.62,1.63 mencoder.c,1.203,1.204

[Richard Felker CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv9456

Modified Files:
	cfg-mencoder.h mencoder.c 
Log Message:
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)

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cfg-mencoder.h	11 Jan 2003 20:32:46 -0000	1.62
+++ cfg-mencoder.h	24 Jan 2003 01:04:50 -0000	1.63
@@ -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},
 

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- mencoder.c	19 Jan 2003 01:48:50 -0000	1.203
+++ mencoder.c	24 Jan 2003 01:04:50 -0000	1.204
@@ -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");