Fix aspect_fit to work correctly when borders need to be added on top and

bottom, previous code accidentally compared against screen dimensions,
resulting in cropping instead of added borders.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29558 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-08-27 12:38:22 +00:00
parent 4cbff98bad
commit e18b64611c
1 changed files with 2 additions and 2 deletions

View File

@ -99,11 +99,11 @@ void aspect_fit(int *srcw, int *srch, int fitw, int fith){
#ifdef ASPECT_DEBUG
printf("aspect(2) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(*srch>aspdat.scrh || *srch<aspdat.orgh){
if(*srch>fith || *srch<aspdat.orgh){
tmpw = (int)(((float)fith / (float)aspdat.preh * (float)aspdat.prew)
* ((float)aspdat.scrw / ((float)aspdat.scrh / (1.0/monitor_aspect))));
tmpw+= tmpw%2; // round
if(tmpw<=aspdat.scrw /*&& tmpw>=aspdat.orgw*/){
if(tmpw<=fitw /*&& tmpw>=aspdat.orgw*/){
*srch = fith;
*srcw = tmpw;
}else{