[FFmpeg-cvslog] swscale: fix crash with swscale-test when using slices

Pedro Arthur git at videolan.org
Fri Jun 10 14:46:07 CEST 2016


ffmpeg | branch: master | Pedro Arthur <bygrandao at gmail.com> | Wed Jun  8 21:36:16 2016 -0300| [b5deacfb1fece3406ef0bb790c1614a7096513b4] | committer: Pedro Arthur

swscale: fix crash with swscale-test when using slices

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

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

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 4d6cfd1..b231abe 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -575,7 +575,7 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[],
     case AV_PIX_FMT_RGB48BE:
     case AV_PIX_FMT_RGBA64LE:
     case AV_PIX_FMT_RGBA64BE:
-        packed16togbra16(src[0] + srcSliceY * srcStride[0], srcStride[0],
+        packed16togbra16(src[0], srcStride[0],
                          dst2013, stride2013, srcSliceH, alpha, swap,
                          16 - bpc, c->srcW);
         break;
@@ -583,7 +583,7 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[],
     case AV_PIX_FMT_BGR48BE:
     case AV_PIX_FMT_BGRA64LE:
     case AV_PIX_FMT_BGRA64BE:
-        packed16togbra16(src[0] + srcSliceY * srcStride[0], srcStride[0],
+        packed16togbra16(src[0], srcStride[0],
                          dst1023, stride1023, srcSliceH, alpha, swap,
                          16 - bpc, c->srcW);
         break;



More information about the ffmpeg-cvslog mailing list