summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_scale.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-12 19:06:15 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-12 19:06:15 +0000
commit6ab0d987add91595f0d01116d9506d06620719d1 (patch)
tree66368cff64099254943ff838f26ba91fac2ada46 /libmpcodecs/vf_scale.c
parent762d6ac6aad55f59959037ffbfbfbaa5ec34439d (diff)
downloadmpv-6ab0d987add91595f0d01116d9506d06620719d1.tar.bz2
mpv-6ab0d987add91595f0d01116d9506d06620719d1.tar.xz
keep aspect ratio - based on Fredrik Kuivinen's idea
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6061 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vf_scale.c')
-rw-r--r--libmpcodecs/vf_scale.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index 59fc956311..73c58574d8 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -19,6 +19,9 @@ struct vf_priv_s {
SwsContext *ctx;
};
+extern int opt_screen_size_x;
+extern int opt_screen_size_y;
+
//===========================================================================//
static unsigned int outfmt_list[]={
@@ -105,7 +108,11 @@ static int config(struct vf_instance_s* vf,
return 0;
}
vf->priv->fmt=best;
-
+
+ if(!opt_screen_size_x && !opt_screen_size_y){
+ d_width=d_width*vf->priv->w/width;
+ d_height=d_height*vf->priv->h/height;
+ }
return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,best);
}