[FFmpeg-cvslog] sws: revert: "swscale: Remove two bogus asserts"

Michael Niedermayer git at videolan.org
Thu Sep 13 16:52:06 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 13 15:53:05 2012 +0200| [0ed0f2e56600d8b404c22530a75c11b60a5380a7] | committer: Michael Niedermayer

sws: revert: "swscale: Remove two bogus asserts"

Also change them to av_assert

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

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

 libswscale/swscale.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 4824271..daf7e90 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -628,6 +628,8 @@ static int swScale(SwsContext *c, const uint8_t *src[],
                     }
                 }
             } else {
+                av_assert1(lumSrcPtr  + vLumFilterSize - 1 < lumPixBuf  + vLumBufSize * 2);
+                av_assert1(chrUSrcPtr + vChrFilterSize - 1 < 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