From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 19 Oct 2001 15:50:44 +0000 (+0000)
Subject: first line bug fixed (happend if the image was scaled down or 1:1)
X-Git-Tag: v0.5~18267
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84adc106cf2ced0d10ff429027e9a89608e8f62d;p=platform%2Fupstream%2Flibav.git

first line bug fixed (happend if the image was scaled down or 1:1)

Originally committed as revision 2298 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
---

diff --git a/postproc/swscale.c b/postproc/swscale.c
index 61b5c54..878c7dd 100644
--- a/postproc/swscale.c
+++ b/postproc/swscale.c
@@ -98,7 +98,6 @@ static int old_s_xinc= -1;
 
 #endif
 int canMMX2BeUsed=0;
-static int test=0;
 int srcWidth= (dstw*s_xinc + 0x8000)>>16;
 
 #ifdef HAVE_MMX2
@@ -119,7 +118,7 @@ s_xinc2=s_xinc>>1;
   s_last_y1pos=-99;
 
   if(y==0){
-      s_srcypos= s_yinc/2 - 0x8000;
+      s_srcypos=-0x8000;
       s_ypos=0;
 #ifdef HAVE_MMX2
 // cant downscale !!!
@@ -534,6 +533,12 @@ FUNNYUVCODE
 	  xpos+=s_xinc2;
       }
 #endif
+	// if this is the line before the first line
+	if(s_srcypos == s_xinc - 0x8000)
+	{
+		s_srcypos= s_yinc/2 - 0x8000;
+		continue;
+	}
     }
 
 
diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c
index 61b5c54..878c7dd 100644
--- a/postproc/swscale_template.c
+++ b/postproc/swscale_template.c
@@ -98,7 +98,6 @@ static int old_s_xinc= -1;
 
 #endif
 int canMMX2BeUsed=0;
-static int test=0;
 int srcWidth= (dstw*s_xinc + 0x8000)>>16;
 
 #ifdef HAVE_MMX2
@@ -119,7 +118,7 @@ s_xinc2=s_xinc>>1;
   s_last_y1pos=-99;
 
   if(y==0){
-      s_srcypos= s_yinc/2 - 0x8000;
+      s_srcypos=-0x8000;
       s_ypos=0;
 #ifdef HAVE_MMX2
 // cant downscale !!!
@@ -534,6 +533,12 @@ FUNNYUVCODE
 	  xpos+=s_xinc2;
       }
 #endif
+	// if this is the line before the first line
+	if(s_srcypos == s_xinc - 0x8000)
+	{
+		s_srcypos= s_yinc/2 - 0x8000;
+		continue;
+	}
     }