diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:18:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:18:17 +0200 |
| commit | 8862c49661fb0655882a78547ca70561f2c5d766 (patch) | |
| tree | a0395080fdf4cc733f7317726d28bcd9201ff1bd | |
| parent | 4e855c11b50b2f5b29cfd570d7cf7efeaff558d5 (diff) | |
| parent | 5420099cab1e915b191cceccec4364f54cec6e52 (diff) | |
| download | ffmpeg-8862c49661fb0655882a78547ca70561f2c5d766.tar.gz | |
Merge commit '5420099cab1e915b191cceccec4364f54cec6e52'
* commit '5420099cab1e915b191cceccec4364f54cec6e52':
swscale: correctly pad destination buffer in rgb conversion
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index c5c36e417f..99148d1385 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1284,7 +1284,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) && !dst_bswap && !src_bswap) conv(srcPtr, dstPtr + dstStride[0] * srcSliceY, - srcSliceH * srcStride[0]); + (srcSliceH - 1) * srcStride[0] + c->srcW * srcBpp); else { int i, j; dstPtr += dstStride[0] * srcSliceY; |