1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

swscale/swscale_unscaled: Fix chroma slice height

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-03-28 22:30:59 +01:00
parent 4daec0c677
commit 8865ae959b

View File

@ -150,10 +150,10 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[],
dstParam[0], dstStride[0]); dstParam[0], dstStride[0]);
if (c->dstFormat == AV_PIX_FMT_NV12) if (c->dstFormat == AV_PIX_FMT_NV12)
interleaveBytes(src[1], src[2], dst, c->chrSrcW, c->chrSrcH, interleaveBytes(src[1], src[2], dst, c->chrSrcW, (srcSliceH + 1) / 2,
srcStride[1], srcStride[2], dstStride[1]); srcStride[1], srcStride[2], dstStride[1]);
else else
interleaveBytes(src[2], src[1], dst, c->chrSrcW, c->chrSrcH, interleaveBytes(src[2], src[1], dst, c->chrSrcW, (srcSliceH + 1) / 2,
srcStride[2], srcStride[1], dstStride[1]); srcStride[2], srcStride[1], dstStride[1]);
return srcSliceH; return srcSliceH;
@ -171,10 +171,10 @@ static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[],
dstParam[0], dstStride[0]); dstParam[0], dstStride[0]);
if (c->srcFormat == AV_PIX_FMT_NV12) if (c->srcFormat == AV_PIX_FMT_NV12)
deinterleaveBytes(src[1], dst1, dst2, c->chrSrcW, c->chrSrcH, deinterleaveBytes(src[1], dst1, dst2, c->chrSrcW, (srcSliceH + 1) / 2,
srcStride[1], dstStride[1], dstStride[2]); srcStride[1], dstStride[1], dstStride[2]);
else else
deinterleaveBytes(src[1], dst2, dst1, c->chrSrcW, c->chrSrcH, deinterleaveBytes(src[1], dst2, dst1, c->chrSrcW, (srcSliceH + 1) / 2,
srcStride[1], dstStride[2], dstStride[1]); srcStride[1], dstStride[2], dstStride[1]);
return srcSliceH; return srcSliceH;