[MPlayer-cvslog] r29557 - in trunk/libvo: aspect.c aspect.h

[reimar]

Author: reimar
Date: Thu Aug 27 14:35:23 2009
New Revision: 29557

Log:
Forgotten changes to aspect code to handle -wid with -fs.

Modified:
   trunk/libvo/aspect.c
   trunk/libvo/aspect.h

Modified: trunk/libvo/aspect.c
==============================================================================
--- trunk/libvo/aspect.c	Thu Aug 27 14:03:02 2009	(r29556)
+++ trunk/libvo/aspect.c	Thu Aug 27 14:35:23 2009	(r29557)
@@ -123,6 +123,11 @@ void aspect_fit(int *srcw, int *srch, in
 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");

Modified: trunk/libvo/aspect.h
==============================================================================
--- trunk/libvo/aspect.h	Thu Aug 27 14:03:02 2009	(r29556)
+++ trunk/libvo/aspect.h	Thu Aug 27 14:35:23 2009	(r29557)
@@ -33,6 +33,7 @@ void aspect_save_prescale(int prew, int 
 
 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