Skip to content

F
ffmpeg
Commit 8865ae95 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

swscale/swscale_unscaled: Fix chroma slice height 

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 4daec0c6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libswscale/swscale_unscaled.c
View file @ 8865ae95
...@@ -150,10 +150,10 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[], ...@@ -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[], ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment