Merge commit '601c2015bc16f0b281160292a6a760cbbbb0eacb'

* commit '601c2015bc16f0b281160292a6a760cbbbb0eacb': svq3: Avoid a division by zero Conflicts: libavcodec/svq3.c See: 4fa706a4a6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · c092af3008
parent 61a8eaf711 601c2015bc
commit c092af3008
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@ -986,7 +986,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
            int offset                = get_bits_count(&gb) + 7 >> 3;
            uint8_t *buf;

-            if (watermark_height <= 0 || (uint64_t)watermark_width*4 > UINT_MAX/watermark_height)
+            if (watermark_height <= 0 ||
+                (uint64_t)watermark_width * 4 > UINT_MAX / watermark_height)
                return -1;

            buf = av_malloc(buf_len);