[FFmpeg-cvslog] swscale: fix invalid memory accesses in yuvpacked1() functions.

[Ronald S. Bultje]

ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sun Feb 12 15:47:14 2012 -0800| [1ca7dc60d2f2cac8fce1bdb53d3d5bae195161b0] | committer: Ronald S. Bultje

swscale: fix invalid memory accesses in yuvpacked1() functions.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ca7dc60d2f2cac8fce1bdb53d3d5bae195161b0
---

 libswscale/output.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libswscale/output.c b/libswscale/output.c
index 93a6a03..5b2ba37 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -629,20 +629,20 @@ yuv2422_1_c_template(SwsContext *c, const int16_t *buf0,
                      const int16_t *abuf0, uint8_t *dest, int dstW,
                      int uvalpha, int y, enum PixelFormat target)
 {
-    const int16_t *ubuf0 = ubuf[0], *ubuf1 = ubuf[1],
-                  *vbuf0 = vbuf[0], *vbuf1 = vbuf[1];
+    const int16_t *ubuf0 = ubuf[0], *vbuf0 = vbuf[0];
     int i;
 
     if (uvalpha < 2048) {
         for (i = 0; i < (dstW >> 1); i++) {
             int Y1 = buf0[i * 2]     >> 7;
             int Y2 = buf0[i * 2 + 1] >> 7;
-            int U  = ubuf1[i]        >> 7;
-            int V  = vbuf1[i]        >> 7;
+            int U  = ubuf0[i]        >> 7;
+            int V  = vbuf0[i]        >> 7;
 
             output_pixels(i * 4, Y1, U, Y2, V);
         }
     } else {
+        const int16_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1];
         for (i = 0; i < (dstW >> 1); i++) {
             int Y1 =  buf0[i * 2]          >> 7;
             int Y2 =  buf0[i * 2 + 1]      >> 7;
@@ -775,8 +775,7 @@ yuv2rgb48_1_c_template(SwsContext *c, const int32_t *buf0,
                        const int32_t *abuf0, uint16_t *dest, int dstW,
                        int uvalpha, int y, enum PixelFormat target)
 {
-    const int32_t *ubuf0 = ubuf[0], *ubuf1 = ubuf[1],
-                  *vbuf0 = vbuf[0], *vbuf1 = vbuf[1];
+    const int32_t *ubuf0 = ubuf[0], *vbuf0 = vbuf[0];
     int i;
 
     if (uvalpha < 2048) {
@@ -807,6 +806,7 @@ yuv2rgb48_1_c_template(SwsContext *c, const int32_t *buf0,
             dest += 6;
         }
     } else {
+        const int32_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1];
         for (i = 0; i < (dstW >> 1); i++) {
             int Y1 = (buf0[i * 2]    ) >> 2;
             int Y2 = (buf0[i * 2 + 1]) >> 2;
@@ -1070,16 +1070,15 @@ yuv2rgb_1_c_template(SwsContext *c, const int16_t *buf0,
                      int uvalpha, int y, enum PixelFormat target,
                      int hasAlpha)
 {
-    const int16_t *ubuf0 = ubuf[0], *ubuf1 = ubuf[1],
-                  *vbuf0 = vbuf[0], *vbuf1 = vbuf[1];
+    const int16_t *ubuf0 = ubuf[0], *vbuf0 = vbuf[0];
     int i;
 
     if (uvalpha < 2048) {
         for (i = 0; i < (dstW >> 1); i++) {
             int Y1 = buf0[i * 2]     >> 7;
             int Y2 = buf0[i * 2 + 1] >> 7;
-            int U  = ubuf1[i]        >> 7;
-            int V  = vbuf1[i]        >> 7;
+            int U  = ubuf0[i]        >> 7;
+            int V  = vbuf0[i]        >> 7;
             int A1, A2;
             const void *r =  c->table_rV[V],
                        *g = (c->table_gU[U] + c->table_gV[V]),
@@ -1094,6 +1093,7 @@ yuv2rgb_1_c_template(SwsContext *c, const int16_t *buf0,
                           r, g, b, y, target, hasAlpha);
         }
     } else {
+        const int16_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1];
         for (i = 0; i < (dstW >> 1); i++) {
             int Y1 =  buf0[i * 2]          >> 7;
             int Y2 =  buf0[i * 2 + 1]      >> 7;