[Mplayer-cvslog] CVS: main cfg-mencoder.h,1.66,1.67

[D Richard Felker III]

On Sun, Aug 03, 2003 at 09:47:06PM +0200, Diego Biurrun wrote:
> Richard Felker CVS writes:
>  > Modified Files:
>  > 	cfg-mencoder.h 
>  > Log Message:
>  > -noslices support for mencoder. ugly hack, but vf_crop and vf_expand
>  > are super buggy with slices enabled... :((
>  > 
>  > --- cfg-mencoder.h	3 Mar 2003 11:03:17 -0000	1.66
>  > +++ cfg-mencoder.h	3 Aug 2003 18:59:49 -0000	1.67
>  > @@ -147,6 +147,8 @@
>  >  	{NULL, NULL, 0, 0, 0, 0, NULL}
>  >  };
>  >  
>  > +extern int vd_use_slices;
>  > +
>  >  static config_t mencoder_opts[]={
>  >  	/* name, pointer, type, flags, min, max */
>  >  	{"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */
>  > @@ -186,6 +188,10 @@
>  >  	{"vobsubout", &vobsub_out, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  >  	{"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
>  >  	{"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  > +
>  > +	// draw by slices or whole frame (usefull with libmpeg2/libavcodec)
>  > +	{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
>  > +	{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
> 
> Please pardon my ignorance if this is obviously wrong, but why didn't
> you add this to cfg-common.h instead?

It really should be there, but config-common.h is rather strange. It
doesn't declare any of the external variables it needs; it assumes
they're already available. And I wasn't sure if it was ok to add
extern stuff to cfg-common.h. If it's really no problem, feel free to
move them.

Rich