[Scummvm-git-logs] scummvm master -> 962ef7b0f5d0fa793cd6c94ca746decf97edc2ab

Scorpeg noreply at scummvm.org
Fri Oct 23 21:59:45 UTC 2026


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:
962ef7b0f5 IMAGE: Fix Clang warnings in the VC-1 decoder


Commit: 962ef7b0f5d0fa793cd6c94ca746decf97edc2ab
    https://github.com/scummvm/scummvm/commit/962ef7b0f5d0fa793cd6c94ca746decf97edc2ab
Author: Scorp (scorp at mrs.mn)
Date: 2026-10-24T00:59:33+03:00

Commit Message:
IMAGE: Fix Clang warnings in the VC-1 decoder

Changed paths:
    image/codecs/vc1.cpp
    image/codecs/vc1.h


diff --git a/image/codecs/vc1.cpp b/image/codecs/vc1.cpp
index c31a75f3b83..3966dca3011 100644
--- a/image/codecs/vc1.cpp
+++ b/image/codecs/vc1.cpp
@@ -6765,16 +6765,16 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, Bits *gb) {
 	v->field_mode = field_mode;
 	v->fcm = fcm;
 
-	assert(v->s.mb_height == v->s.height + 15 >> 4 || v->s.mb_height == FFALIGN(v->s.height + 15 >> 4, 2));
+	assert(v->s.mb_height == (v->s.height + 15) >> 4 || v->s.mb_height == FFALIGN((v->s.height + 15) >> 4, 2));
 	if (v->field_mode) {
-		v->s.mb_height = FFALIGN(v->s.height + 15 >> 4, 2);
+		v->s.mb_height = FFALIGN((v->s.height + 15) >> 4, 2);
 		v->fptype = get_bits(gb, 3);
 		if (v->fptype & 4) // B-picture
 			v->s.pict_type = (v->fptype & 2) ? AV_PICTURE_TYPE_BI : AV_PICTURE_TYPE_B;
 		else
 			v->s.pict_type = (v->fptype & 2) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
 	} else {
-		v->s.mb_height = v->s.height + 15 >> 4;
+		v->s.mb_height = (v->s.height + 15) >> 4;
 		switch (get_unary(gb, 0, 4)) {
 		case 0:
 			v->s.pict_type = AV_PICTURE_TYPE_P;
@@ -8457,10 +8457,10 @@ static inline void vc1_p_h_loop_filter(VC1Context *v, uint8 *dest, uint32 *cbp,
 			right_is_intra = is_intra[1] & (1 << block_num);
 			right_cbp = cbp[1] >> (block_num * 4);
 		} else if (block_num & 1) {
-			right_is_intra = is_intra[1] & (1 << block_num - 1);
+			right_is_intra = is_intra[1] & (1 << (block_num - 1));
 			right_cbp = cbp[1] >> ((block_num - 1) * 4);
 		} else {
-			right_is_intra = is_intra[0] & (1 << block_num + 1);
+			right_is_intra = is_intra[0] & (1 << (block_num + 1));
 			right_cbp = cbp[0] >> ((block_num + 1) * 4);
 		}
 
@@ -8508,10 +8508,10 @@ static inline void vc1_p_v_loop_filter(VC1Context *v, uint8 *dest, const uint32
 			bottom_is_intra = is_intra[s->mb_stride] & (1 << block_num);
 			bottom_cbp = cbp[s->mb_stride] >> (block_num * 4);
 		} else if (block_num < 2) {
-			bottom_is_intra = is_intra[0] & (1 << block_num + 2);
+			bottom_is_intra = is_intra[0] & (1 << (block_num + 2));
 			bottom_cbp = cbp[0] >> ((block_num + 2) * 4);
 		} else {
-			bottom_is_intra = is_intra[s->mb_stride] & (1 << block_num - 2);
+			bottom_is_intra = is_intra[s->mb_stride] & (1 << (block_num - 2));
 			bottom_cbp = cbp[s->mb_stride] >> ((block_num - 2) * 4);
 		}
 
@@ -9412,8 +9412,8 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir) {
 	}
 
 	if (v->rangeredfrm || use_ic || s->h_edge_pos < 22 || v_edge_pos < 22 ||
-		(unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx & 3) - 16 - s->mspel * 3 ||
-		(unsigned)(src_y - 1) > v_edge_pos - (my & 3) - 16 - 3) {
+		(unsigned)(src_x - s->mspel) > (unsigned)(s->h_edge_pos - (mx & 3) - 16 - s->mspel * 3) ||
+		(unsigned)(src_y - 1) > (unsigned)(v_edge_pos - (my & 3) - 16 - 3)) {
 		uint8 *ubuf = s->sc.edge_emu_buffer + 19 * s->linesize;
 		uint8 *vbuf = ubuf + 9 * s->uvlinesize;
 		const int k = 17 + s->mspel * 2;
@@ -9421,11 +9421,11 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir) {
 		srcY -= s->mspel * (1 + s->linesize);
 		if (interlace) {
 			s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcY, linesize << 1, linesize << 1, k,
-									 v->field_mode ? k : k + 1 >> 1, src_x - s->mspel,
-									 src_y - s->mspel >> !v->field_mode, s->h_edge_pos, s->v_edge_pos >> 1);
+									 v->field_mode ? k : (k + 1) >> 1, src_x - s->mspel,
+									 (src_y - s->mspel) >> !v->field_mode, s->h_edge_pos, s->v_edge_pos >> 1);
 			if (!v->field_mode)
 				s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer + linesize, srcY + linesize, linesize << 1,
-										 linesize << 1, k, k >> 1, src_x - s->mspel, src_y - s->mspel + 1 >> 1,
+										 linesize << 1, k, k >> 1, src_x - s->mspel, (src_y - s->mspel + 1) >> 1,
 										 s->h_edge_pos, s->v_edge_pos >> 1);
 		} else
 			s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcY, linesize, linesize, k,
@@ -9440,9 +9440,9 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir) {
 									 uvsrc_y >> !v->field_mode, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
 			if (!v->field_mode) {
 				s->vdsp.emulated_edge_mc(ubuf + uvlinesize, srcU + uvlinesize, uvlinesize << 1, uvlinesize << 1, 9, 4,
-										 uvsrc_x, uvsrc_y + 1 >> 1, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
+										 uvsrc_x, (uvsrc_y + 1) >> 1, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
 				s->vdsp.emulated_edge_mc(vbuf + uvlinesize, srcV + uvlinesize, uvlinesize << 1, uvlinesize << 1, 9, 4,
-										 uvsrc_x, uvsrc_y + 1 >> 1, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
+										 uvsrc_x, (uvsrc_y + 1) >> 1, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
 			}
 		} else {
 			s->vdsp.emulated_edge_mc(ubuf, srcU, uvlinesize, uvlinesize, 9, v->field_mode ? 17 : 9, uvsrc_x,
@@ -9606,20 +9606,20 @@ void ff_vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg) {
 		srcY += linesize;
 
 	if (v->rangeredfrm || use_ic || s->h_edge_pos < 13 || v_edge_pos < 23 ||
-		(unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx & 3) - 8 - s->mspel * 2 ||
-		(unsigned)(src_y - (s->mspel << fieldmv)) > v_edge_pos - (my & 3) - ((8 + s->mspel * 2) << fieldmv)) {
+		(unsigned)(src_x - s->mspel) > (unsigned)(s->h_edge_pos - (mx & 3) - 8 - s->mspel * 2) ||
+		(unsigned)(src_y - (s->mspel << fieldmv)) > (unsigned)(v_edge_pos - (my & 3) - ((8 + s->mspel * 2) << fieldmv))) {
 		const int k = 9 + s->mspel * 2;
 
 		srcY -= s->mspel * (1 + (s->linesize << fieldmv));
 		/* check emulate edge stride and offset */
 		if (interlace) {
 			s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcY, linesize << 1, linesize << 1, k,
-									 v->field_mode ? k : (k << fieldmv) + 1 >> 1, src_x - s->mspel,
-									 src_y - (s->mspel << fieldmv) >> !v->field_mode, s->h_edge_pos,
+									 v->field_mode ? k : ((k << fieldmv) + 1) >> 1, src_x - s->mspel,
+									 (src_y - (s->mspel << fieldmv)) >> !v->field_mode, s->h_edge_pos,
 									 s->v_edge_pos >> 1);
 			if (!v->field_mode && !fieldmv)
 				s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer + linesize, srcY + linesize, linesize << 1,
-										 linesize << 1, k, k >> 1, src_x - s->mspel, src_y - s->mspel + 1 >> 1,
+										 linesize << 1, k, k >> 1, src_x - s->mspel, (src_y - s->mspel + 1) >> 1,
 										 s->h_edge_pos, s->v_edge_pos >> 1);
 		} else
 			s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcY, linesize, linesize, k,
@@ -9762,7 +9762,7 @@ void ff_vc1_mc_4mv_chroma(VC1Context *v, int dir) {
 	}
 
 	if (v->rangeredfrm || use_ic || s->h_edge_pos < 18 || v_edge_pos < 18 ||
-		(unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9 || (unsigned)uvsrc_y > (v_edge_pos >> 1) - 9) {
+		(unsigned)uvsrc_x > (unsigned)((s->h_edge_pos >> 1) - 9) || (unsigned)uvsrc_y > (unsigned)((v_edge_pos >> 1) - 9)) {
 		if (interlace) {
 			s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcU, uvlinesize << 1, uvlinesize << 1, 9,
 									 v->field_mode ? 9 : 5, uvsrc_x, uvsrc_y >> !v->field_mode, s->h_edge_pos >> 1,
@@ -9772,10 +9772,10 @@ void ff_vc1_mc_4mv_chroma(VC1Context *v, int dir) {
 									 s->v_edge_pos >> 2);
 			if (!v->field_mode) {
 				s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer + uvlinesize, srcU + uvlinesize, uvlinesize << 1,
-										 uvlinesize << 1, 9, 4, uvsrc_x, uvsrc_y + 1 >> 1, s->h_edge_pos >> 1,
+										 uvlinesize << 1, 9, 4, uvsrc_x, (uvsrc_y + 1) >> 1, s->h_edge_pos >> 1,
 										 s->v_edge_pos >> 2);
 				s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer + 16 + uvlinesize, srcV + uvlinesize, uvlinesize << 1,
-										 uvlinesize << 1, 9, 4, uvsrc_x, uvsrc_y + 1 >> 1, s->h_edge_pos >> 1,
+										 uvlinesize << 1, 9, 4, uvsrc_x, (uvsrc_y + 1) >> 1, s->h_edge_pos >> 1,
 										 s->v_edge_pos >> 2);
 			}
 		} else {
@@ -9881,20 +9881,20 @@ void ff_vc1_mc_4mv_chroma4(VC1Context *v, int dir, int dir2, int avg) {
 		uvmy_field[i] = (uvmy_field[i] & 3) << 1;
 
 		if (use_ic || s->h_edge_pos < 10 || v_edge_pos < (5 << fieldmv) ||
-			(unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 5 || (unsigned)uvsrc_y > v_edge_pos - (5 << fieldmv)) {
+			(unsigned)uvsrc_x > (unsigned)((s->h_edge_pos >> 1) - 5) || (unsigned)uvsrc_y > (unsigned)(v_edge_pos - (5 << fieldmv))) {
 			if (interlace) {
 				s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcU, uvlinesize << 1, uvlinesize << 1, 5,
-										 (5 << fieldmv) + 1 >> 1, uvsrc_x, uvsrc_y >> 1, s->h_edge_pos >> 1,
+										 ((5 << fieldmv) + 1) >> 1, uvsrc_x, uvsrc_y >> 1, s->h_edge_pos >> 1,
 										 s->v_edge_pos >> 2);
 				s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer + 16, srcV, uvlinesize << 1, uvlinesize << 1, 5,
-										 (5 << fieldmv) + 1 >> 1, uvsrc_x, uvsrc_y >> 1, s->h_edge_pos >> 1,
+										 ((5 << fieldmv) + 1) >> 1, uvsrc_x, uvsrc_y >> 1, s->h_edge_pos >> 1,
 										 s->v_edge_pos >> 2);
 				if (!fieldmv) {
 					s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer + uvlinesize, srcU + uvlinesize, uvlinesize << 1,
-											 uvlinesize << 1, 5, 2, uvsrc_x, uvsrc_y + 1 >> 1, s->h_edge_pos >> 1,
+											 uvlinesize << 1, 5, 2, uvsrc_x, (uvsrc_y + 1) >> 1, s->h_edge_pos >> 1,
 											 s->v_edge_pos >> 2);
 					s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer + 16 + uvlinesize, srcV + uvlinesize,
-											 uvlinesize << 1, uvlinesize << 1, 5, 2, uvsrc_x, uvsrc_y + 1 >> 1,
+											 uvlinesize << 1, uvlinesize << 1, 5, 2, uvsrc_x, (uvsrc_y + 1) >> 1,
 											 s->h_edge_pos >> 1, s->v_edge_pos >> 2);
 				}
 			} else {
@@ -10013,8 +10013,8 @@ void ff_vc1_interp_mc(VC1Context *v) {
 	}
 
 	if (v->rangeredfrm || s->h_edge_pos < 22 || v_edge_pos < 22 || use_ic ||
-		(unsigned)(src_x - 1) > s->h_edge_pos - (mx & 3) - 16 - 3 ||
-		(unsigned)(src_y - 1) > v_edge_pos - (my & 3) - 16 - 3) {
+		(unsigned)(src_x - 1) > (unsigned)(s->h_edge_pos - (mx & 3) - 16 - 3) ||
+		(unsigned)(src_y - 1) > (unsigned)(v_edge_pos - (my & 3) - 16 - 3)) {
 		uint8 *ubuf = s->sc.edge_emu_buffer + 19 * s->linesize;
 		uint8 *vbuf = ubuf + 9 * s->uvlinesize;
 		const int k = 17 + s->mspel * 2;
@@ -10022,11 +10022,11 @@ void ff_vc1_interp_mc(VC1Context *v) {
 		srcY -= s->mspel * (1 + s->linesize);
 		if (interlace) {
 			s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcY, linesize << 1, linesize << 1, k,
-									 v->field_mode ? k : (k + 1 >> 1), src_x - s->mspel,
-									 src_y - s->mspel >> !v->field_mode, s->h_edge_pos, s->v_edge_pos >> 1);
+									 v->field_mode ? k : ((k + 1) >> 1), src_x - s->mspel,
+									 (src_y - s->mspel) >> !v->field_mode, s->h_edge_pos, s->v_edge_pos >> 1);
 			if (!v->field_mode)
 				s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer + linesize, srcY + linesize, linesize << 1,
-										 linesize << 1, k, k >> 1, src_x - s->mspel, src_y - s->mspel + 1 >> 1,
+										 linesize << 1, k, k >> 1, src_x - s->mspel, (src_y - s->mspel + 1) >> 1,
 										 s->h_edge_pos, s->v_edge_pos >> 1);
 		} else
 			s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcY, linesize, linesize, k,
@@ -10041,9 +10041,9 @@ void ff_vc1_interp_mc(VC1Context *v) {
 									 uvsrc_y >> !v->field_mode, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
 			if (!v->field_mode) {
 				s->vdsp.emulated_edge_mc(ubuf + uvlinesize, srcU + uvlinesize, uvlinesize << 1, uvlinesize << 1, 9, 4,
-										 uvsrc_x, uvsrc_y + 1 >> 1, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
+										 uvsrc_x, (uvsrc_y + 1) >> 1, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
 				s->vdsp.emulated_edge_mc(vbuf + uvlinesize, srcV + uvlinesize, uvlinesize << 1, uvlinesize << 1, 9, 4,
-										 uvsrc_x, uvsrc_y + 1 >> 1, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
+										 uvsrc_x, (uvsrc_y + 1) >> 1, s->h_edge_pos >> 1, s->v_edge_pos >> 2);
 			}
 		} else {
 			s->vdsp.emulated_edge_mc(ubuf, srcU, uvlinesize, uvlinesize, 9, v->field_mode ? 17 : 9, uvsrc_x,
@@ -10567,7 +10567,7 @@ static int vc1_decode_ac_coeff(VC1Context *v, int *last, int *skip, int *value,
 		int escape = decode210(gb);
 		if (escape != 2) {
 			index = get_vlc2(gb, ff_vc1_ac_coeff_table[codingset]);
-			if (index >= ff_vc1_ac_sizes[codingset] - 1U)
+			if ((unsigned)index >= ff_vc1_ac_sizes[codingset] - 1U)
 				return (-1);
 			run = vc1_index_decode_table[codingset][index][0];
 			level = vc1_index_decode_table[codingset][index][1];
@@ -11424,7 +11424,7 @@ static int vc1_decode_p_mb(VC1Context *v) {
 					ff_vc1_mc_4mv_chroma(v, 0);
 				v->mb_type[s->block_index[i]] = is_intra[i];
 				if (!coded_inter)
-					coded_inter = !is_intra[i] & is_coded[i];
+					coded_inter = (!is_intra[i]) & is_coded[i];
 			}
 			// if there are no coded blocks then don't do anything more
 			dst_idx = 0;
@@ -14227,8 +14227,8 @@ static inline int hpel_motion(PictureState *s, uint8 *dest, uint8 *src, int src_
 		dxy |= (motion_y & 1) << 1;
 	src += src_y * s->linesize + src_x;
 
-	if ((unsigned)src_x >= MAX(s->h_edge_pos - (motion_x & 1) - 7, 0) ||
-		(unsigned)src_y >= MAX(s->v_edge_pos - (motion_y & 1) - 7, 0)) {
+	if ((unsigned)src_x >= (unsigned)MAX(s->h_edge_pos - (motion_x & 1) - 7, 0) ||
+		(unsigned)src_y >= (unsigned)MAX(s->v_edge_pos - (motion_y & 1) - 7, 0)) {
 		s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, src, s->linesize, s->linesize, 9, 9, src_x, src_y,
 								 s->h_edge_pos, s->v_edge_pos);
 		src = s->sc.edge_emu_buffer;
@@ -14255,7 +14255,7 @@ static inline void mpeg_motion_internal(PictureState *s, uint8 *dest_y, uint8 *d
 	src_x = s->mb_x * 16 + (motion_x >> 1);
 	src_y = (mb_y << (4 - block_y_half)) + (motion_y >> 1);
 
-	if (!is_mpeg12 && FMT_H263 == FMT_H263) {
+	if (!is_mpeg12) {
 		if ((0) && field_based) {
 			mx = (motion_x >> 1) | (motion_x & 1);
 			my = motion_y >> 1;
@@ -14268,7 +14268,7 @@ static inline void mpeg_motion_internal(PictureState *s, uint8 *dest_y, uint8 *d
 			uvsrc_y = src_y >> 1;
 		}
 		// Even chroma mv's are full pel in H261
-	} else if (!CONFIG_SMALL && !is_mpeg12 || CONFIG_SMALL && FMT_H263 == FMT_H261) {
+	} else if ((!CONFIG_SMALL && !is_mpeg12) || (CONFIG_SMALL && FMT_H263 == FMT_H261)) {
 		assert(FMT_H263 == FMT_H261);
 		mx = motion_x / 4;
 		my = motion_y / 4;
@@ -14303,8 +14303,8 @@ static inline void mpeg_motion_internal(PictureState *s, uint8 *dest_y, uint8 *d
 	ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
 	ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
 
-	if ((unsigned)src_x >= MAX(s->h_edge_pos - (motion_x & 1) - 15, 0) ||
-		(unsigned)src_y >= MAX(v_edge_pos - (motion_y & 1) - h + 1, 0)) {
+	if ((unsigned)src_x >= (unsigned)MAX(s->h_edge_pos - (motion_x & 1) - 15, 0) ||
+		(unsigned)src_y >= (unsigned)MAX(v_edge_pos - (motion_y & 1) - h + 1, 0)) {
 		if (is_mpeg12 || (CONFIG_SMALL && (false || false))) {
 
 			return;
@@ -14395,8 +14395,8 @@ static inline void qpel_motion(PictureState *s, uint8 *dest_y, uint8 *dest_cb, u
 	ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
 	ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
 
-	if ((unsigned)src_x >= MAX(s->h_edge_pos - (motion_x & 3) - 15, 0) ||
-		(unsigned)src_y >= MAX(v_edge_pos - (motion_y & 3) - h + 1, 0)) {
+	if ((unsigned)src_x >= (unsigned)MAX(s->h_edge_pos - (motion_x & 3) - 15, 0) ||
+		(unsigned)src_y >= (unsigned)MAX(v_edge_pos - (motion_y & 3) - h + 1, 0)) {
 		s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, ptr_y, s->linesize, s->linesize, 17, 17 + field_based, src_x,
 								 src_y * (1 << field_based), s->h_edge_pos, s->v_edge_pos);
 		ptr_y = s->sc.edge_emu_buffer;
@@ -14468,8 +14468,8 @@ static void chroma_4mv_motion(PictureState *s, uint8 *dest_cb, uint8 *dest_cr, u
 
 	offset = src_y * s->uvlinesize + src_x;
 	ptr = ref_picture[1] + offset;
-	if ((unsigned)src_x >= MAX((s->h_edge_pos >> 1) - (dxy & 1) - 7, 0) ||
-		(unsigned)src_y >= MAX((s->v_edge_pos >> 1) - (dxy >> 1) - 7, 0)) {
+	if ((unsigned)src_x >= (unsigned)MAX((s->h_edge_pos >> 1) - (dxy & 1) - 7, 0) ||
+		(unsigned)src_y >= (unsigned)MAX((s->v_edge_pos >> 1) - (dxy >> 1) - 7, 0)) {
 		s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, ptr, s->uvlinesize, s->uvlinesize, 9, 9, src_x, src_y,
 								 s->h_edge_pos >> 1, s->v_edge_pos >> 1);
 		ptr = s->sc.edge_emu_buffer;
@@ -14515,8 +14515,8 @@ static inline void apply_8x8(PictureState *s, uint8 *dest_y, uint8 *dest_cb, uin
 				dxy &= ~12;
 
 			ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
-			if ((unsigned)src_x >= MAX(s->h_edge_pos - (motion_x & 3) - 7, 0) ||
-				(unsigned)src_y >= MAX(s->v_edge_pos - (motion_y & 3) - 7, 0)) {
+			if ((unsigned)src_x >= (unsigned)MAX(s->h_edge_pos - (motion_x & 3) - 7, 0) ||
+				(unsigned)src_y >= (unsigned)MAX(s->v_edge_pos - (motion_y & 3) - 7, 0)) {
 				s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, ptr, s->linesize, s->linesize, 9, 9, src_x, src_y,
 										 s->h_edge_pos, s->v_edge_pos);
 				ptr = s->sc.edge_emu_buffer;
diff --git a/image/codecs/vc1.h b/image/codecs/vc1.h
index 6059694fee9..f71b92eedcc 100644
--- a/image/codecs/vc1.h
+++ b/image/codecs/vc1.h
@@ -47,7 +47,7 @@ namespace Image {
 struct VC1Ratio {
 	int num;
 	int den;
-	VC1Ratio(int numerator = 0, int denominator = 1) : num(numerator), den(denominator) {}
+	constexpr VC1Ratio(int numerator = 0, int denominator = 1) : num(numerator), den(denominator) {}
 };
 
 struct VC1Header {




More information about the Scummvm-git-logs mailing list