--- common/video/iso-mpeg4/src/vtc_shape_ShapeDecoding.cpp.orig	2005-05-04 13:56:00.000000000 -0600
+++ common/video/iso-mpeg4/src/vtc_shape_ShapeDecoding.cpp	2009-11-19 03:25:29.000000000 -0700
@@ -99,7 +99,7 @@
   recmask = (UChar *)
     malloc(coded_width*coded_height*sizeof(UChar));
   if(outmask == NULL || recmask == NULL) {
-    errorHandler("Memory allocation failed\n");
+    errorHandler((char*)"Memory allocation failed\n");
   }
   
 #if 1
@@ -112,7 +112,7 @@
     if(!startCodeEnable) {
       codedLevels = GetBitsFromStream_Still(4);
       if(GetBitsFromStream_Still(1)!=MARKER_BIT)
-	errorHandler("Incorrect Marker bit in shape enhanced layer decoding.\n");
+	errorHandler((char*)"Incorrect Marker bit in shape enhanced layer decoding.\n");
       /* if(*targetLevel < levels-codedLevels ) */ 
       *targetLevel = levels-codedLevels;
     }
@@ -144,7 +144,7 @@
       /*  errorHandler("Error in retrieving TEXTURE_SPATIAL_START_CODE\n"); */
       GetBitsFromStream_Still(5);
       if(GetBitsFromStream_Still(1)!= MARKER_BIT) 
-	errorHandler("Incorrect Marker bit in the end of Shape Bitstream\n");
+	errorHandler((char*)"Incorrect Marker bit in the end of Shape Bitstream\n");
     }
 // FPDAM begin: deleted by Sharp
 /*
@@ -183,7 +183,7 @@
       *constAlphaValue = (UChar) GetBitsFromStream_Still(8);
 //     *shapeScalable = GetBitsFromStream_Still(1); // FPDAM : deleted by Sharp
     if(GetBitsFromStream_Still(1)!=MARKER_BIT)
-      errorHandler("Incorrect Marker bit in header decoding.\n");
+      errorHandler((char*)"Incorrect Marker bit in header decoding.\n");
     return(0);
     
 }
@@ -201,7 +201,7 @@
   ShapeBaseDeCoding(outmask, w, h, change_CR_disable);
 
   if(GetBitsFromStream_Still(1)!=MARKER_BIT)
-    errorHandler("Incorrect Marker bit in shape base layer decoding.\n");
+    errorHandler((char*)"Incorrect Marker bit in shape base layer decoding.\n");
   return(0);
 }
 
@@ -224,7 +224,7 @@
     GetBitsFromStream_Still(32);
     GetBitsFromStream_Still(5);
     if(GetBitsFromStream_Still(1)!=MARKER_BIT)
-      errorHandler("Incorrect Marker bit in shape enhanced layer decoding.\n");
+      errorHandler((char*)"Incorrect Marker bit in shape enhanced layer decoding.\n");
   }
 
   w = (coded_width >>k);
@@ -236,7 +236,7 @@
   half_mask = (UChar *) calloc(w*h2, sizeof(UChar));
   cur_mask = (UChar *) calloc(w2*h2, sizeof(UChar));
   if(low_mask==NULL || cur_mask==NULL || half_mask==NULL){
-    errorHandler("memory alloc. error: spa_mask!\n");
+    errorHandler((char*)"memory alloc. error: spa_mask!\n");
   }
  
   for(l=0;l<h;l++){
@@ -248,7 +248,7 @@
   ShapeEnhDeCoding(low_mask, half_mask, cur_mask, w2, h2, filter);
 
   if(GetBitsFromStream_Still(1)!=MARKER_BIT)
-    errorHandler("Incorrect Marker bit in shape enhanced layer decoding.\n");
+    errorHandler((char*)"Incorrect Marker bit in shape enhanced layer decoding.\n");
 
   for(l=0;l<h2;l++){
     for(m=0; m<w2;m++){