diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-06 21:26:46 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-06 21:26:46 +0000 |
| commit | 2fa8fe4ad37a22bd6b7a41e4e456c33e529372dd (patch) | |
| tree | 09b2f3f1e0de3e11c1209ac4b9c3132b078564b0 /libmpcodecs | |
| parent | 49a7110b03b6b0ed3a9b00acf68d03b0d5afa867 (diff) | |
| download | mpv-2fa8fe4ad37a22bd6b7a41e4e456c33e529372dd.tar.bz2 mpv-2fa8fe4ad37a22bd6b7a41e4e456c33e529372dd.tar.xz | |
do not modify d_width and d_height when -xy option was given, otherwise -xy has no effect with e.g. vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13269 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_scale.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index c7ee7f2c05..899b095876 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -40,6 +40,7 @@ static struct vf_priv_s { extern int opt_screen_size_x; extern int opt_screen_size_y; +extern float screen_size_xy; //===========================================================================// @@ -232,7 +233,7 @@ static int config(struct vf_instance_s* vf, break; } } - if(!opt_screen_size_x && !opt_screen_size_y){ + if(!opt_screen_size_x && !opt_screen_size_y && !(screen_size_xy >= 0.001)){ // Compute new d_width and d_height, preserving aspect // while ensuring that both are >= output size in pixels. if (vf->priv->h * d_width > vf->priv->w * d_height) { |