Mercurial > mplayer.hg

comparison libvo/aspect.c @ 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 7681eab10aea
children 87897065b7d7
comparison
equal deleted inserted replaced
29514:23a59bb3baf4 29515:d3700065005f
121 } 121 }
122 122
123 void aspect(int *srcw, int *srch, int zoom){ 123 void aspect(int *srcw, int *srch, int zoom){
124 int fitw = zoom ? aspdat.scrw : aspdat.prew; 124 int fitw = zoom ? aspdat.scrw : aspdat.prew;
125 int fith = zoom ? aspdat.scrh : aspdat.preh; 125 int fith = zoom ? aspdat.scrh : aspdat.preh;
126 if (zoom && WinID >= 0) zoom = A_WINZOOM;
127 if (zoom == A_WINZOOM) {
128 fitw = vo_dwidth;
129 fith = vo_dheight;
130 }
126 if( !zoom && geometry_wh_changed ) { 131 if( !zoom && geometry_wh_changed ) {
127 #ifdef ASPECT_DEBUG 132 #ifdef ASPECT_DEBUG
128 printf("aspect(0) no aspect forced!\n"); 133 printf("aspect(0) no aspect forced!\n");
129 #endif 134 #endif
130 return; // the user doesn't want to fix aspect 135 return; // the user doesn't want to fix aspect