[Scummvm-git-logs] scummvm master -> 5ae7720bfbb4399d6adb42e74ac8d848d44e8a24

[Scorpeg]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
5ae7720bfb VIDEO: Fix VC-1 MAX type mismatch on platforms with unsigned long uint32


Commit: 5ae7720bfbb4399d6adb42e74ac8d848d44e8a24
    https://github.com/scummvm/scummvm/commit/5ae7720bfbb4399d6adb42e74ac8d848d44e8a24
Author: Scorp (scorp at mrs.mn)
Date: 2026-10-22T16:18:27+03:00

Commit Message:
VIDEO: Fix VC-1 MAX type mismatch on platforms with unsigned long uint32

Changed paths:
    image/codecs/vc1.cpp


diff --git a/image/codecs/vc1.cpp b/image/codecs/vc1.cpp
index d447d7bbaea..08d9fbb280c 100644
--- a/image/codecs/vc1.cpp
+++ b/image/codecs/vc1.cpp
@@ -13193,7 +13193,7 @@ static void guess_dc(ERContext *s, int16 *dc, int w, int h, ptrdiff_t stride, in
 			weight_sum = 0;
 			guess = 0;
 			for (j = 0; j < 4; j++) {
-				int64 weight = 256 * 256 * 256 * 16 / MAX(dist[b_x + b_y * stride][j], 1U);
+				int64 weight = 256 * 256 * 256 * 16 / MAX<uint32>(dist[b_x + b_y * stride][j], 1);
 				guess += weight * (int64)col[b_x + b_y * stride][j];
 				weight_sum += weight;
 			}