From e18b64611cca4d972d25f2128a74eef8d9e86330 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 27 Aug 2009 12:38:22 +0000
Subject: 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
---
 libvo/aspect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libvo')

diff --git a/libvo/aspect.c b/libvo/aspect.c
index df61d2938b..068690821c 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -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{
-- 
cgit v1.2.3