[FFmpeg-cvslog] avfilter/vf_showinfo: fix the integer handling issues

Limin Wang git at videolan.org
Fri Jan 10 18:56:10 EET 2020


ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Thu Jan  9 09:02:11 2020 +0800| [9519c8dbb749c8c658b4ada6f6e03cea7521e611] | committer: Michael Niedermayer

avfilter/vf_showinfo: fix the integer handling issues

Fixes CID 1457606 and 1457607

Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavfilter/vf_showinfo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 5fff123682..79b79db2d3 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -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];
         }
     }
 }



More information about the ffmpeg-cvslog mailing list