aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2014-08-03 10:28:49 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-08-04 12:55:07 +0100
commit5420099cab1e915b191cceccec4364f54cec6e52 (patch)
treec268316464d4b516d79c2f518a2d1598d8b04a1e
parent23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac (diff)
downloadffmpeg-5420099cab1e915b191cceccec4364f54cec6e52.tar.gz
swscale: correctly pad destination buffer in rgb conversion
Bug-Id: 772 CC: libav-stable@libav.org Found-By: Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--libswscale/swscale_unscaled.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 02850eac17..a1ccc5ab76 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -677,7 +677,7 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[],
if (dstStride[0] * srcBpp == srcStride[0] * dstBpp && srcStride[0] > 0 &&
!(srcStride[0] % srcBpp))
conv(srcPtr, dstPtr + dstStride[0] * srcSliceY,
- srcSliceH * srcStride[0]);
+ (srcSliceH - 1) * srcStride[0] + c->srcW * srcBpp);
else {
int i;
dstPtr += dstStride[0] * srcSliceY;