casa-mp-base

--- common/video/iso-mpeg4/include/globals.hpp.orig 2005-05-04 13:55:58.000000000 -0600

+++ common/video/iso-mpeg4/include/globals.hpp  2009-11-19 04:57:22.000000000 -0700

@@ -82,24 +82,24 @@

 /* for displaying state information */

 EXTERN Char *mapStateToText[]

 #ifdef DEFINE_GLOBALS

- = {"S_DC", "S_INIT", "S_ZTR", "S_ZTR_D", "S_IZ", "S_VZTR", "S_VAL", "S_LINIT",

- "S_LZTR", "S_LZTR_D", "S_LVZTR"}

+ = {(char*)"S_DC", (char*)"S_INIT", (char*)"S_ZTR", (char*)"S_ZTR_D", (char*)"S_IZ", (char*)"S_VZTR", (char*)"S_VAL", (char*)"S_LINIT",

+ (char*)"S_LZTR", (char*)"S_LZTR_D", (char*)"S_LVZTR"}

 #endif

 ;

 /* for displaying Type information */

 EXTERN Char *mapTypeToText[]

 #ifdef DEFINE_GLOBALS

- =  {"IZ", "VAL", "ZTR", "VZTR", "ZTR_D", "VLEAF", "ZLEAF",

-     "UNTYPED"}

+ =  {(char*)"IZ", (char*)"VAL", (char*)"ZTR", (char*)"VZTR", (char*)"ZTR_D", (char*)"VLEAF", (char*)"ZLEAF",

+     (char*)"UNTYPED"}

 #endif

 ;

 /* for displaying arithmetic probability model information */

 EXTERN Char *mapArithModelToText[]

 #ifdef DEFINE_GLOBALS

-= {"ACM_NONE", "ACM_SKIP", "ACM_ROOT", "ACM_VALZ", "ACM_VALNZ", "ACM_RESID",

-  "ACM_DC"}

+= {(char*)"ACM_NONE", (char*)"ACM_SKIP", (char*)"ACM_ROOT", (char*)"ACM_VALZ", (char*)"ACM_VALNZ", (char*)"ACM_RESID",

+  (char*)"ACM_DC"}

 #endif

 ;

@@ -115,7 +115,7 @@

    the encoding phase is written. */

 EXTERN Char *mapFileEnc

 #ifdef DEFINE_GLOBALS

-="mapEnc"

+=(char*)"mapEnc"

 #endif

 ;

@@ -123,7 +123,7 @@

    the decoding phase is written. */

 EXTERN Char *mapFileDec

 #ifdef DEFINE_GLOBALS

-="mapDec"

+=(char*)"mapDec"

 #endif

 ;