[FFmpeg-devel] [PATCH] swscale/swscale_unscaled: Fix undefined NULL + 0

[Andreas Rheinhardt]

Affected the fitsdec-gbrp16 FATE-test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libswscale/swscale_unscaled.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 8838cc8b53..0b97377934 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -695,7 +695,7 @@ static void packed16togbra16(const uint8_t *src, int srcStride,
             }
         }
         for (i = 0; i < 4; i++)
-            dst[i] += dstStride[i] >> 1;
+            dst[i] = FF_PTR_ADD(dst[i], dstStride[i] >> 1);
     }
 }
 
@@ -729,8 +729,8 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[],
     }
 
     for(i=0; i<4; i++) {
-        dst2013[i] += stride2013[i] * srcSliceY / 2;
-        dst1023[i] += stride1023[i] * srcSliceY / 2;
+        dst2013[i] = FF_PTR_ADD(dst2013[i], stride2013[i] * srcSliceY / 2);
+        dst1023[i] = FF_PTR_ADD(dst1023[i], stride1023[i] * srcSliceY / 2);
     }
 
     switch (c->srcFormat) {
-- 
2.34.1