summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-03 20:36:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-04 14:34:13 +0100
commit353bd158f5d497c9acab98c22d10b99ca92f45d6 (patch)
treebf69a86081b9e8e113d09c0d2c94de0527bad173 /libswscale
parent63c61f0be03624fbd9e352d8393122beb3ddcc1a (diff)
downloadffmpeg-streaming-353bd158f5d497c9acab98c22d10b99ca92f45d6.zip
ffmpeg-streaming-353bd158f5d497c9acab98c22d10b99ca92f45d6.tar.gz
sws: Fix "warning: comparison of distinct pointer types lacks a cast"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 4d9bd89..bb90819 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -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];
OpenPOWER on IntegriCloud