From 195cce45cf7c35521717c45871b314a8e61c8e90 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 26 Mar 2021 16:17:04 +0100 Subject: [PATCH] avcodec/g2meet: Fix undefined NULL + 0 Affected the g2m4 FATE-test. Signed-off-by: Andreas Rheinhardt (cherry picked from commit a86f3e983ec113689af48dd49ae043d85c8dc8bd) --- libavcodec/g2meet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 68b1b9dc74..da910c1e59 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -1029,7 +1029,7 @@ static int kempf_restore_buf(const uint8_t *src, int len, else if (npal <= 16) nb = 4; else nb = 8; - for (j = 0; j < height; j++, dst += stride, jpeg_tile += tile_stride) { + for (j = 0; j < height; j++, dst += stride, jpeg_tile = FF_PTR_ADD(jpeg_tile, tile_stride)) { if (get_bits(&gb, 8)) continue; for (i = 0; i < width; i++) {