]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/vf_showinfo: fix the integer handling issues
authorLimin Wang <lance.lmwang@gmail.com>
Thu, 9 Jan 2020 01:02:11 +0000 (09:02 +0800)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 10 Jan 2020 16:52:14 +0000 (17:52 +0100)
Fixes CID 1457606 and 1457607

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_showinfo.c

index 5fff12368203522a8468d3f134eb463db9a0e857..79b79db2d3aa442f03c812a0ec4fdc23f0db371a 100644 (file)
@@ -221,10 +221,10 @@ static void update_sample_stats_16(int be, const uint8_t *src, int len, int64_t
     for (i = 0; i < len / 2; i++) {
         if ((HAVE_BIGENDIAN && !be) || (!HAVE_BIGENDIAN && be)) {
             *sum += av_bswap16(src1[i]);
-            *sum2 += av_bswap16(src1[i]) * av_bswap16(src1[i]);
+            *sum2 += (uint32_t)av_bswap16(src1[i]) * (uint32_t)av_bswap16(src1[i]);
         } else {
             *sum += src1[i];
-            *sum2 += src1[i] * src1[i];
+            *sum2 += (uint32_t)src1[i] * (uint32_t)src1[i];
         }
     }
 }