[FFmpeg-cvslog] swscale/swscale_unscaled: Fix chroma slice height

Michael Niedermayer git at videolan.org
Thu Mar 28 23:49:38 EET 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Mar 28 22:30:59 2019 +0100| [8865ae959b18af7a400dc391d6d1e13c6027119f] | committer: Michael Niedermayer

swscale/swscale_unscaled: Fix chroma slice height

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8865ae959b18af7a400dc391d6d1e13c6027119f
---

 libswscale/swscale_unscaled.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index d01e3733ef..be04a236d8 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -150,10 +150,10 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[],
               dstParam[0], dstStride[0]);
 
     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]);
     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]);
 
     return srcSliceH;
@@ -171,10 +171,10 @@ static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[],
               dstParam[0], dstStride[0]);
 
     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]);
     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]);
 
     return srcSliceH;



More information about the ffmpeg-cvslog mailing list