diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
| commit | 0e1b7765be878491565cf5e471f22b15e106164c (patch) | |
| tree | 422e500c289335182a2a64934dcabf10b95e32dc /libvo/video_out.c | |
| parent | a9618c1c6fe9424dfaeb1677348e0382d7252554 (diff) | |
| parent | dcfd043ea8d0c46929aad78596314d837c290d39 (diff) | |
| download | mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.bz2 mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.xz | |
Merge svn changes up to r29644
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index f81544fc93..01c04f3ca6 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -476,9 +476,9 @@ void calc_src_dst_rects(struct vo *vo, int src_width, int src_height, if (borders) { borders->left = 0; borders->top = 0; } - if (vo_fs) { - aspect(vo, &scaled_width, &scaled_height, A_ZOOM); - panscan_calc(vo); + if (aspect_scaling()) { + aspect(vo, &scaled_width, &scaled_height, A_WINZOOM); + panscan_calc_windowed(vo); scaled_width += vo->panscan_x; scaled_height += vo->panscan_y; if (borders) { |