aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-26 16:17:04 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-02 21:41:14 +0200
commit195cce45cf7c35521717c45871b314a8e61c8e90 (patch)
tree12eb89ac1ddb720d497339eff79cb1838c4fc2fd
parentc7a95509b374bc32ec991d02bb1627c0ebd82298 (diff)
downloadffmpeg-195cce45cf7c35521717c45871b314a8e61c8e90.tar.gz
avcodec/g2meet: Fix undefined NULL + 0
Affected the g2m4 FATE-test. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> (cherry picked from commit a86f3e983ec113689af48dd49ae043d85c8dc8bd)
-rw-r--r--libavcodec/g2meet.c2
1 files changed, 1 insertions, 1 deletions
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++) {