Mercurial > mplayer.hg

changeset 29515:d3700065005f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Forgotten changes to aspect code to handle -wid with -fs.
author reimar
date Thu, 27 Aug 2009 12:35:23 +0000
parents 23a59bb3baf4
children 87897065b7d7
files libvo/aspect.c libvo/aspect.h
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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");
--- 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