[SCM] libav/wheezy-security: swscale: Remove two bogus asserts
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Oct 19 20:18:10 UTC 2014
The following commit has been merged in the wheezy-security branch:
commit ce57531a8894d69e3da085c7c6cba45b1f133b35
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Sep 11 22:11:25 2012 +0200
swscale: Remove two bogus asserts
(cherry picked from commit b9141aa346b736adffd27e1a98bd12aa7b628a8f)
Signed-off-by: Diego Biurrun <diego at biurrun.de>
Conflicts:
libswscale/swscale.c
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 1d0ea1b..1b9130c 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2644,8 +2644,6 @@ static int swScale(SwsContext *c, const uint8_t* src[],
}
}
} else {
- assert(lumSrcPtr + vLumFilterSize - 1 < lumPixBuf + vLumBufSize*2);
- assert(chrUSrcPtr + vChrFilterSize - 1 < chrUPixBuf + vChrBufSize*2);
if (c->yuv2packed1 && vLumFilterSize == 1 && vChrFilterSize == 2) { //unscaled RGB
int chrAlpha = vChrFilter[2 * dstY + 1];
yuv2packed1(c, *lumSrcPtr, chrUSrcPtr, chrVSrcPtr,
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list