mirror of
https://github.com/mpv-player/mpv
synced 2025-01-20 21:07:29 +01:00
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
This commit is contained in:
parent
e8429f1f5b
commit
4cbff98bad
@ -123,6 +123,11 @@ void aspect_fit(int *srcw, int *srch, int fitw, int fith){
|
|||||||
void aspect(int *srcw, int *srch, int zoom){
|
void aspect(int *srcw, int *srch, int zoom){
|
||||||
int fitw = zoom ? aspdat.scrw : aspdat.prew;
|
int fitw = zoom ? aspdat.scrw : aspdat.prew;
|
||||||
int fith = zoom ? aspdat.scrh : aspdat.preh;
|
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 ) {
|
if( !zoom && geometry_wh_changed ) {
|
||||||
#ifdef ASPECT_DEBUG
|
#ifdef ASPECT_DEBUG
|
||||||
printf("aspect(0) no aspect forced!\n");
|
printf("aspect(0) no aspect forced!\n");
|
||||||
|
@ -33,6 +33,7 @@ void aspect_save_prescale(int prew, int preh);
|
|||||||
|
|
||||||
void aspect_save_screenres(int scrw, int scrh);
|
void aspect_save_screenres(int scrw, int scrh);
|
||||||
|
|
||||||
|
#define A_WINZOOM 2 ///< zoom to fill window size
|
||||||
#define A_ZOOM 1
|
#define A_ZOOM 1
|
||||||
#define A_NOZOOM 0
|
#define A_NOZOOM 0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user