[FFmpeg-cvslog] sws: Fix "warning: comparison of distinct pointer types lacks a cast"

Michael Niedermayer git at videolan.org
Mon Feb 4 14:37:46 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  3 20:36:58 2013 +0100| [353bd158f5d497c9acab98c22d10b99ca92f45d6] | committer: Michael Niedermayer

sws: Fix "warning: comparison of distinct pointer types lacks a cast"

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libswscale/swscale.c |    4 ++--
 1 file 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];



More information about the ffmpeg-cvslog mailing list