OSDN Git Service

sws: Fix "warning: comparison of distinct pointer types lacks a cast"
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Feb 2013 19:36:58 +0000 (20:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Feb 2013 13:34:13 +0000 (14:34 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale.c

index 4d9bd89..bb90819 100644 (file)
@@ -632,8 +632,8 @@ static int swScale(SwsContext *c, const uint8_t *src[],
                     }
                 }
             } else if (yuv2packedX) {
-                av_assert1(lumSrcPtr  + vLumFilterSize - 1 < lumPixBuf  + vLumBufSize * 2);
-                av_assert1(chrUSrcPtr + vChrFilterSize - 1 < chrUPixBuf + vChrBufSize * 2);
+                av_assert1(lumSrcPtr  + vLumFilterSize - 1 < (const int16_t **)lumPixBuf  + vLumBufSize * 2);
+                av_assert1(chrUSrcPtr + vChrFilterSize - 1 < (const int16_t **)chrUPixBuf + vChrBufSize * 2);
                 if (c->yuv2packed1 && vLumFilterSize == 1 &&
                     vChrFilterSize <= 2) { // unscaled RGB
                     int chrAlpha = vChrFilterSize == 1 ? 0 : vChrFilter[2 * dstY + 1];