# HG changeset patch
# User reimar
# Date 1251376523 0
# Node ID d3700065005f535367bc55633d73fd6bca7e9134
# Parent  23a59bb3baf48e666a15be6efe689ef4973b66a5
Forgotten changes to aspect code to handle -wid with -fs.

diff -r 23a59bb3baf4 -r d3700065005f libvo/aspect.c
--- a/libvo/aspect.c	Thu Aug 27 12:03:02 2009 +0000
+++ b/libvo/aspect.c	Thu Aug 27 12:35:23 2009 +0000
@@ -123,6 +123,11 @@
 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 -r 23a59bb3baf4 -r d3700065005f libvo/aspect.h
--- a/libvo/aspect.h	Thu Aug 27 12:03:02 2009 +0000
+++ b/libvo/aspect.h	Thu Aug 27 12:35:23 2009 +0000
@@ -33,6 +33,7 @@
 
 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