From 9c7b9e166746a903dc0b7e87967ec257967e1359 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 10 Sep 2016 10:43:23 -0400
Subject: IMAGE: Compilation fixes for Indeo4 decoder

---
 image/codecs/indeo/indeo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'image/codecs/indeo/indeo.cpp')

diff --git a/image/codecs/indeo/indeo.cpp b/image/codecs/indeo/indeo.cpp
index 69b9f4289b..2c11a09883 100644
--- a/image/codecs/indeo/indeo.cpp
+++ b/image/codecs/indeo/indeo.cpp
@@ -1304,7 +1304,7 @@ int IndeoDecoderBase::ivi_decode_coded_blocks(GetBits *gb, IVIBandDesc *band,
 		col_flags[pos & col_mask] |= !!val;
 	}
 
-	if (scan_pos < 0 || scan_pos >= num_coeffs && sym != rvmap->eob_sym)
+	if (scan_pos < 0 || (scan_pos >= num_coeffs && sym != rvmap->eob_sym))
 		return -1; // corrupt block data
 
 	// undoing DC coeff prediction for intra-blocks
@@ -1348,7 +1348,7 @@ int IndeoDecoderBase::ivi_dc_transform(IVIBandDesc *band, int *prev_dc,
 /*------------------------------------------------------------------------*/
 
 int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx) {
-	if (((w + 128) * (uint64)(h + 128)) < (INT_MAX / 8))
+	if (((w + 128) * (uint64)(h + 128)) < (MAX_INTEGER / 8))
 		return 0;
 
 	error("Picture size %ux%u is invalid", w, h);
-- 
cgit v1.2.3