From bd169a313c795652a27a6f20d81f6e6507b79e06 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 4 Oct 2014 22:17:36 +0200
Subject: options: add --no-keepaspect-window

Seems silly, but was requested.
---
 video/out/w32_common.c | 4 ++--
 video/out/x11_common.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'video')

diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index 3fcfc6d969..addc46bf0e 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -551,8 +551,8 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
         break;
     }
     case WM_SIZING:
-        if (w32->opts->keepaspect && !w32->opts->fullscreen &&
-            w32->opts->WinID < 0)
+        if (w32->opts->keepaspect && w32->opts->keepaspect_window &&
+            !w32->opts->fullscreen && w32->opts->WinID < 0)
         {
             RECT *rc = (RECT*)lParam;
             // get client area of the windows if it had the rect rc
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index aed54f9010..b094364a6e 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -999,7 +999,7 @@ static void vo_x11_sizehint(struct vo *vo, struct mp_rect rc, bool override_pos)
     hint->max_width = 0;
     hint->max_height = 0;
 
-    if (opts->keepaspect) {
+    if (opts->keepaspect && opts->keepaspect_window) {
         hint->flags |= PAspect;
         hint->min_aspect.x = hint->width;
         hint->min_aspect.y = hint->height;
-- 
cgit v1.2.3