X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmmpeg2%2Fsrc%2Fmpeg2dec%2Fglobal.h;h=a0c0647d57e83513a3b71c0eabecea360d30ab4a;hb=d93bdc3a545dc713354ab0c8ad9558ee11dfe0e9;hp=363e0db1f198be6b4363d0401a8e382d3c7fffae;hpb=b307c3639ecb0cbc03d141836132d153a6799c5f;p=gdcm.git diff --git a/src/gdcmmpeg2/src/mpeg2dec/global.h b/src/gdcmmpeg2/src/mpeg2dec/global.h index 363e0db1..a0c0647d 100644 --- a/src/gdcmmpeg2/src/mpeg2dec/global.h +++ b/src/gdcmmpeg2/src/mpeg2dec/global.h @@ -72,7 +72,7 @@ void Decode_MPEG2_Non_Intra_Block _ANSI_ARGS_((int comp)); int Get_Hdr _ANSI_ARGS_((void)); void next_start_code _ANSI_ARGS_((void)); int slice_header _ANSI_ARGS_((void)); -void marker_bit _ANSI_ARGS_((char *text)); +void marker_bit _ANSI_ARGS_((const char *text)); /* getpic.c */ void Decode_Picture _ANSI_ARGS_((int bitstream_framenum, @@ -105,7 +105,7 @@ void motion_vector _ANSI_ARGS_((int *PMV, int *dmvector, void Dual_Prime_Arithmetic _ANSI_ARGS_((int DMV[][2], int *dmvector, int mvx, int mvy)); /* mpeg2dec.c */ -void Error _ANSI_ARGS_((char *text)); +void Error _ANSI_ARGS_((const char *text)); void Warning _ANSI_ARGS_((char *text)); void Print_Bits _ANSI_ARGS_((int code, int bits, int len)); @@ -238,6 +238,7 @@ EXTERN int Inverse_Table_6_9[8][4] #define T_PPM 3 #define T_X11 4 #define T_X11HIQ 5 +#define T_MEM 6 /* decoder operation control variables */ EXTERN int Output_Type; @@ -263,11 +264,13 @@ EXTERN int Main_Bitstream_Flag; /* filenames */ -EXTERN char *Output_Picture_Filename; -EXTERN char *Substitute_Picture_Filename; -EXTERN char *Main_Bitstream_Filename; -EXTERN char *Enhancement_Layer_Bitstream_Filename; +EXTERN const char *Output_Picture_Filename; +EXTERN const char *Substitute_Picture_Filename; +EXTERN const char *Main_Bitstream_Filename; +EXTERN const char *Enhancement_Layer_Bitstream_Filename; +/* Pointer to allocated memory */ +EXTERN char *OUTMEM; /* buffers for multiuse purposes */ EXTERN char Error_Text[256]; @@ -287,7 +290,7 @@ EXTERN unsigned char *llframe0[3]; EXTERN unsigned char *llframe1[3]; EXTERN short *lltmp; -EXTERN char *Lower_Layer_Picture_Filename; +EXTERN const char *Lower_Layer_Picture_Filename;