[SCM] libav/experimental: correct chroma skewing bug, caused by incorrect stride adjustments

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 45eeae39ac0978e97a7cb1703fa9f961894ce327
Author: Marc Hoffman <mmhoffm at gmail.com>
Date:   Fri Jun 22 00:07:55 2007 +0000

    correct chroma skewing bug, caused by incorrect stride adjustments
    
    Originally committed as revision 23601 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/internal_bfin.S b/libswscale/internal_bfin.S
index c413f2f..9ed98c3 100644
--- a/libswscale/internal_bfin.S
+++ b/libswscale/internal_bfin.S
@@ -476,24 +476,26 @@ DEFUN(uyvytoyv12, mL3,  (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8
 
         r1 = [fp + ARG_srcStride];
         r2 = r0 + r1;
-        r1 += -16;
+        r1 += -8;
         m0 = r1;
 
         i0 = r0;  // uyvy_T even
         i1 = r2;  // uyvy_B odd
 
-        r2 = [fp + ARG_chromStride];
-        m1 = r2;
-
         p2 = [fp + ARG_lumStride];
         p1 = p0 + p2;  // Y bot odd
-        p2 += -4;
 
         p5 = [fp + ARG_width];
         p4 = [fp + ARG_height];
+        r0 = p5;
         p4 = p4 >> 1;
         p5 = p5 >> 2;
 
+        r2 = [fp + ARG_chromStride];
+        r0 = r0 >> 1;
+        r2 = r2 - r0;
+        m1 = r2;
+
         r6.l = w[i2--];  r6.l = w[i2];
         r6.h = w[i3--];  r6.h = w[i3];
         /*   I0,I1 - src input line pointers
@@ -521,6 +523,8 @@ DEFUN(uyvytoyv12, mL3,  (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8
 
           i0 += m0;
           i1 += m0;
+          i2 += m1;
+          i3 += m1;
           p0 = p0 + p2;
 1:        p1 = p1 + p2;
 

-- 
Libav/FFmpeg packaging