Mercurial > mplayer.hg
diff libvo/aspect.c @ 2058:b840d0913383
Fix case where srch, srcw and fitinw and fitinh are really the same variables.
author | atmos4 |
---|---|
date | Wed, 03 Oct 2001 17:40:56 +0000 |
parents | f5146118777e |
children | 7f27b212e07b |
line wrap: on
line diff
--- a/libvo/aspect.c Wed Oct 03 17:27:13 2001 +0000 +++ b/libvo/aspect.c Wed Oct 03 17:40:56 2001 +0000 @@ -9,17 +9,18 @@ void aspect(int *srcw, int *srch, int fitinw, int fitinh){ int srcwcp, srchcp; srcwcp=*srcw; srchcp=*srch; - *srcw=fitinw; - *srch=(int)(((float)fitinw / (float)srcwcp * (float)srchcp) + srcwcp=fitinw; + srchcp=(int)(((float)fitinw / (float)*srcw * (float)*srch) * ((float)fitinh/((float)fitinw/monitor_aspect))); - *srch+=*srch%2; // round - //printf("aspect rez wh: %dx%d\n",*srcw,*srch); - if(*srch>fitinh || *srch<srchcp){ - *srch=fitinh; - *srcw=(int)(((float)fitinh / (float)srchcp * (float)srcwcp) + srchcp+=srchcp%2; // round + //printf("aspect rez wh: %dx%d (org: %dx%d)\n",srcwcp,srchcp,*srcw,*srch); + if(srchcp>fitinh || srchcp<*srch){ + srchcp=fitinh; + srcwcp=(int)(((float)fitinh / (float)*srch * (float)*srcw) * ((float)fitinw/((float)fitinh/(1/monitor_aspect)))); - *srcw+=*srcw%2; // round + srcwcp+=srcwcp%2; // round } - //printf("aspect ret wh: %dx%d\n",*srcw,*srch); + //printf("aspect ret wh: %dx%d (org: %dx%d)\n",srcwcp,srchcp,*srcw,*srch); + *srcw=srcwcp; *srch=srchcp; }