From 4cbff98bade70f952748e9c3f3281e79fd61f291 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 27 Aug 2009 12:35:23 +0000
Subject: Forgotten changes to aspect code to handle -wid with -fs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29557 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/aspect.c | 5 +++++
 libvo/aspect.h | 1 +
 2 files changed, 6 insertions(+)

(limited to 'libvo')

diff --git a/libvo/aspect.c b/libvo/aspect.c
index e54e8deb43..df61d2938b 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -123,6 +123,11 @@ void aspect_fit(int *srcw, int *srch, int fitw, int fith){
 void aspect(int *srcw, int *srch, int zoom){
   int fitw = zoom ? aspdat.scrw : aspdat.prew;
   int fith = zoom ? aspdat.scrh : aspdat.preh;
+  if (zoom && WinID >= 0) zoom = A_WINZOOM;
+  if (zoom == A_WINZOOM) {
+    fitw = vo_dwidth;
+    fith = vo_dheight;
+  }
   if( !zoom && geometry_wh_changed ) {
 #ifdef ASPECT_DEBUG
     printf("aspect(0) no aspect forced!\n");
diff --git a/libvo/aspect.h b/libvo/aspect.h
index 0c741d4ae3..268153987c 100644
--- a/libvo/aspect.h
+++ b/libvo/aspect.h
@@ -33,6 +33,7 @@ void aspect_save_prescale(int prew, int preh);
 
 void aspect_save_screenres(int scrw, int scrh);
 
+#define A_WINZOOM 2 ///< zoom to fill window size
 #define A_ZOOM 1
 #define A_NOZOOM 0
 
-- 
cgit v1.2.3