[FFmpeg-cvslog] avcodec/g2meet: Fix undefined NULL + 0

Andreas Rheinhardt git at videolan.org
Sat Apr 3 01:18:47 EEST 2021


ffmpeg | branch: release/4.4 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Fri Mar 26 16:17:04 2021 +0100| [195cce45cf7c35521717c45871b314a8e61c8e90] | committer: Andreas Rheinhardt

avcodec/g2meet: Fix undefined NULL + 0

Affected the g2m4 FATE-test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
(cherry picked from commit a86f3e983ec113689af48dd49ae043d85c8dc8bd)

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

 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++) {



More information about the ffmpeg-cvslog mailing list