[XviD-devel] [PATCH 2/3] GCC4 warnings removal

[Edouard Gomez]

Removes the gcc4 warnings. Take care of the ME change, i don't know if
it's right, same caution with the trellis change. Please check before
applying


diff -ur xvidcore-1.1.0-beta2.orig/src/bitstream/bitstream.c xvidcore-1.1.0-beta2/src/bitstream/bitstream.c
--- xvidcore-1.1.0-beta2.orig/src/bitstream/bitstream.c	2005-04-03 22:39:45.000000000 +0200
+++ xvidcore-1.1.0-beta2/src/bitstream/bitstream.c	2005-04-29 15:22:29.000000000 +0200
@@ -1252,7 +1252,7 @@
 	BitstreamPadAlways(bs); /* next_start_code(); */
 
 	/* divx5 userdata string */
-#define DIVX5_ID "DivX503b1393"
+#define DIVX5_ID ((char *)"DivX503b1393")
   if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {
     BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));
   	if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))
@@ -1388,8 +1388,8 @@
 
 void
 BitstreamWriteUserData(Bitstream * const bs,
-						uint8_t * data,
-						const int length)
+						const char *data,
+						const unsigned int length)
 {
 	int i;
 
diff -ur xvidcore-1.1.0-beta2.orig/src/bitstream/bitstream.h xvidcore-1.1.0-beta2/src/bitstream/bitstream.h
--- xvidcore-1.1.0-beta2.orig/src/bitstream/bitstream.h	2005-04-03 22:39:44.000000000 +0200
+++ xvidcore-1.1.0-beta2/src/bitstream/bitstream.h	2005-04-29 15:21:45.000000000 +0200
@@ -146,8 +146,8 @@
 							 unsigned int quant);
 
 void BitstreamWriteUserData(Bitstream * const bs,
-							uint8_t * data,
-							const int length);
+							const char *data,
+							const unsigned int length);
 
 /* initialise bitstream structure */
 
diff -ur xvidcore-1.1.0-beta2.orig/src/decoder.c xvidcore-1.1.0-beta2/src/decoder.c
--- xvidcore-1.1.0-beta2.orig/src/decoder.c	2005-04-03 22:39:45.000000000 +0200
+++ xvidcore-1.1.0-beta2/src/decoder.c	2005-04-29 14:56:18.000000000 +0200
@@ -1155,7 +1155,7 @@
 			MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x];
 			MACROBLOCK *last_mb = &dec->last_mbs[y * dec->mb_width + x];
 			const int fcode_max = (fcode_forward>fcode_backward) ? fcode_forward : fcode_backward;
-			uint32_t intra_dc_threshold; /* fake variable */
+			int32_t intra_dc_threshold; /* fake variable */
 
 			if (check_resync_marker(bs, fcode_max  - 1)) {
 				int bound = read_video_packet_header(bs, dec, fcode_max - 1, &quant,
diff -ur xvidcore-1.1.0-beta2.orig/src/encoder.c xvidcore-1.1.0-beta2/src/encoder.c
--- xvidcore-1.1.0-beta2.orig/src/encoder.c	2005-04-03 22:39:45.000000000 +0200
+++ xvidcore-1.1.0-beta2/src/encoder.c	2005-04-29 15:05:02.000000000 +0200
@@ -114,8 +114,8 @@
 		}
 		
 		div = ((float)*biggest)/((float)65535);
-		*biggest = (int)(((float)*biggest)/div);
-		*other = (int)(((float)*other)/div);
+		*biggest = (unsigned int)(((float)*biggest)/div);
+		*other = (unsigned int)(((float)*other)/div);
 	}
 }
 
@@ -161,7 +161,7 @@
 	pEnc->mbParam.fincr = MAX(create->fincr, 0);
 	pEnc->mbParam.fbase = create->fincr <= 0 ? 25 : create->fbase;
 	if (pEnc->mbParam.fincr>0)
-		simplify_time(&pEnc->mbParam.fincr, &pEnc->mbParam.fbase);
+		simplify_time((int*)&pEnc->mbParam.fincr, (int*)&pEnc->mbParam.fbase);
 
 	/* zones */
 	if(create->num_zones > 0) {
@@ -1155,7 +1155,7 @@
 	type = frame->type;
 	pEnc->current->quant = frame->quant;
 
-	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_BEFORE, &type, &pEnc->current->quant, stats);
+	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_BEFORE, &type, (int*)&pEnc->current->quant, stats);
 
 	if (type > 0){ 	/* XVID_TYPE_?VOP */
 		type = type2coding(type);	/* convert XVID_TYPE_?VOP to bitstream coding type */
diff -ur xvidcore-1.1.0-beta2.orig/src/image/image.c xvidcore-1.1.0-beta2/src/image/image.c
--- xvidcore-1.1.0-beta2.orig/src/image/image.c	2005-04-03 22:39:44.000000000 +0200
+++ xvidcore-1.1.0-beta2/src/image/image.c	2005-04-29 14:57:46.000000000 +0200
@@ -717,7 +717,7 @@
 			 int height,
 			 uint32_t edged_width,
 			 uint8_t * dst[4],
-			 uint32_t dst_stride[4],
+			 int dst_stride[4],
 			 int csp,
 			 int interlacing)
 {
diff -ur xvidcore-1.1.0-beta2.orig/src/image/image.h xvidcore-1.1.0-beta2/src/image/image.h
--- xvidcore-1.1.0-beta2.orig/src/image/image.h	2005-04-03 22:39:44.000000000 +0200
+++ xvidcore-1.1.0-beta2/src/image/image.h	2005-04-29 14:58:30.000000000 +0200
@@ -108,7 +108,7 @@
 				 int height,
 				 uint32_t edged_width,
 				 uint8_t * dst[4],
-				 uint32_t dst_stride[4],
+				 int dst_stride[4],
 				 int csp,
 				 int interlaced);
 
diff -ur xvidcore-1.1.0-beta2.orig/src/motion/estimation_common.c xvidcore-1.1.0-beta2/src/motion/estimation_common.c
--- xvidcore-1.1.0-beta2.orig/src/motion/estimation_common.c	2005-04-03 22:39:44.000000000 +0200
+++ xvidcore-1.1.0-beta2/src/motion/estimation_common.c	2005-04-29 15:27:13.000000000 +0200
@@ -389,8 +389,8 @@
 
 	int xo = 2*data->currentMV[0].x, yo = 2*data->currentMV[0].y;
 	
-	data->currentQMV[0].x = v_best.x = xo;
-	data->currentQMV[0].y = v_best.y = yo;
+	data->currentQMV[0].x = v_best.x = v_best2.x = xo;
+	data->currentQMV[0].y = v_best.y = v_best2.y = yo;
 
 	data->qpel_precision = 1;
 
diff -ur xvidcore-1.1.0-beta2.orig/src/utils/mbtransquant.c xvidcore-1.1.0-beta2/src/utils/mbtransquant.c
--- xvidcore-1.1.0-beta2.orig/src/utils/mbtransquant.c	2005-04-03 22:39:44.000000000 +0200
+++ xvidcore-1.1.0-beta2/src/utils/mbtransquant.c	2005-04-29 15:32:31.000000000 +0200
@@ -774,7 +774,7 @@
 	 * helps. */
 	typedef struct { int16_t Run, Level; } NODE;
 
-	NODE Nodes[65], Last;
+	NODE Nodes[65], Last = { 0, 0};
 	uint32_t Run_Costs0[64+1];
 	uint32_t * const Run_Costs = Run_Costs0 + 1;