diff options
| author |  reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-27 12:35:23 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-27 12:35:23 +0000 |
| commit | 4cbff98bade70f952748e9c3f3281e79fd61f291 (patch) | |
| tree | 43e451fb8aea035cd70f409d8bda13fa50889544 /libvo | |
| parent | e8429f1f5b298dc340425d2c4306167b0205df4d (diff) | |
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
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/aspect.c | 5 | ||||
| -rw-r--r-- | libvo/aspect.h | 1 |
2 files changed, 6 insertions, 0 deletions
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 |