[FFmpeg-cvslog] vp9: fix integer overflow in 10/12bpp DC-only calculation.

Ronald S. Bultje git at videolan.org
Sat Sep 5 21:54:33 CEST 2015


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Fri Sep  4 16:57:07 2015 -0400| [342bca7f02fc7c0e9c4adf43d0ab1fab31aac85b] | committer: Ronald S. Bultje

vp9: fix integer overflow in 10/12bpp DC-only calculation.

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

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

diff --git a/libavcodec/vp9dsp_template.c b/libavcodec/vp9dsp_template.c
index 5a8578a..9395a0c 100644
--- a/libavcodec/vp9dsp_template.c
+++ b/libavcodec/vp9dsp_template.c
@@ -1131,8 +1131,8 @@ static void type_a##_##type_b##_##sz##x##sz##_add_c(uint8_t *_dst, \
 \
     stride /= sizeof(pixel); \
     if (has_dconly && eob == 1) { \
-        const int t  = (((block[0] * 11585 + (1 << 13)) >> 14) \
-                                   * 11585 + (1 << 13)) >> 14; \
+        const int t  = ((((dctint) block[0] * 11585 + (1 << 13)) >> 14) \
+                                            * 11585 + (1 << 13)) >> 14; \
         block[0] = 0; \
         for (i = 0; i < sz; i++) { \
             for (j = 0; j < sz; j++) \



More information about the ffmpeg-cvslog mailing list