no upscale flag so automatic downscaling is possible in mencoder

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17647 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2006-02-18 21:12:56 +00:00
parent d7998ea0ef
commit 8f51734daf
1 changed files with 9 additions and 0 deletions

View File

@ -27,6 +27,7 @@ static struct vf_priv_s {
struct SwsContext *ctx2; //for interlaced slices only
unsigned char* palette;
int interlaced;
int noup;
int query_format_cache[64];
} vf_priv_dflt = {
-1,-1,
@ -144,6 +145,13 @@ static int config(struct vf_instance_s* vf,
}
}
if(vf->priv->noup){
if(vf->priv->w > width)
vf->priv->w= width;
if(vf->priv->h > height)
vf->priv->h= height;
}
if (vf->priv->w <= -8) {
vf->priv->w += 8;
round_w = 1;
@ -603,6 +611,7 @@ static m_option_t vf_opts_fields[] = {
// Note that here the 2 field is NULL (ie 0)
// As we want this option to act on the option struct itself
{"presize", 0, CONF_TYPE_OBJ_PRESETS, 0, 0, 0, &size_preset},
{"noup", ST_OFF(noup), CONF_TYPE_INT, M_OPT_RANGE, 0, 1, NULL},
{ NULL, NULL, 0, 0, 0, 0, NULL }
};