From 18f770162b9d079f2d278a719d7684dd19d86202 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 12 Nov 2002 15:00:04 +0000 Subject: [PATCH] * fixing some minor const warnings Originally committed as revision 1205 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 6 +++--- libavcodec/common.c | 4 ++-- libavcodec/common.h | 2 +- libavcodec/dsputil.h | 2 +- libavcodec/dv.c | 3 ++- libavcodec/mem.c | 2 +- libavcodec/mpegvideo.c | 3 ++- libavcodec/svq1.c | 8 ++++---- libavcodec/utils.c | 2 +- 9 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8e2fc3d589..3e7bb468d3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -773,7 +773,7 @@ typedef struct AVCodecContext { } AVCodecContext; typedef struct AVCodec { - char *name; + const char *name; int type; int id; int priv_data_size; @@ -1021,8 +1021,8 @@ typedef enum { int avcodec(void* handle, avc_cmd_t cmd, void* pin, void* pout); /* memory */ -void *av_malloc(int size); -void *av_mallocz(int size); +void *av_malloc(unsigned int size); +void *av_mallocz(unsigned int size); void av_free(void *ptr); void __av_freep(void **ptr); #define av_freep(p) __av_freep((void **)(p)) diff --git a/libavcodec/common.c b/libavcodec/common.c index 1140d56cc0..2344dc6be3 100644 --- a/libavcodec/common.c +++ b/libavcodec/common.c @@ -133,7 +133,7 @@ void align_get_bits(GetBitContext *s) if(n) skip_bits(s, n); } -int check_marker(GetBitContext *s, char *msg) +int check_marker(GetBitContext *s, const char *msg) { int bit= get_bits1(s); if(!bit) printf("Marker bit missing %s\n", msg); @@ -147,7 +147,7 @@ int check_marker(GetBitContext *s, char *msg) #define GET_DATA(v, table, i, wrap, size) \ {\ - UINT8 *ptr = (UINT8 *)table + i * wrap;\ + const UINT8 *ptr = (UINT8 *)table + i * wrap;\ switch(size) {\ case 1:\ v = *(UINT8 *)ptr;\ diff --git a/libavcodec/common.h b/libavcodec/common.h index 73e2d08f2e..e06055a916 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -639,7 +639,7 @@ static inline void skip_bits1(GetBitContext *s){ void init_get_bits(GetBitContext *s, UINT8 *buffer, int buffer_size); -int check_marker(GetBitContext *s, char *msg); +int check_marker(GetBitContext *s, const char *msg); void align_get_bits(GetBitContext *s); int init_vlc(VLC *vlc, int nb_bits, int nb_codes, const void *bits, int bits_wrap, int bits_size, diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index aa7277ee7b..2ff6fb905a 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -131,7 +131,7 @@ void ff_block_permute(INT16 *block, UINT8 *permutation, const UINT8 *scantable, #if defined(HAVE_MMX) -#undef emms_c() +#undef emms_c #define MM_MMX 0x0001 /* standard MMX */ #define MM_3DNOW 0x0004 /* AMD 3DNOW */ diff --git a/libavcodec/dv.c b/libavcodec/dv.c index dc27dc84c2..d7062c5699 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -495,7 +495,8 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, UINT8 *buf, int buf_size) { DVVideoDecodeContext *s = avctx->priv_data; - int sct, dsf, apt, ds, nb_dif_segs, vs, size, width, height, i, packet_size; + int sct, dsf, apt, ds, nb_dif_segs, vs, width, height, i, packet_size; + unsigned size; UINT8 *buf_ptr; const UINT16 *mb_pos_ptr; AVPicture *picture; diff --git a/libavcodec/mem.c b/libavcodec/mem.c index 5799c07744..a9b5e0afa8 100644 --- a/libavcodec/mem.c +++ b/libavcodec/mem.c @@ -26,7 +26,7 @@ linker will do it automatically */ /* memory alloc */ -void *av_malloc(int size) +void *av_malloc(unsigned int size) { void *ptr; #if defined (HAVE_MEMALIGN) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 357ab20e4e..f1a94ccbee 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -303,7 +303,8 @@ int MPV_common_init(MpegEncContext *s) s->uvlinesize = s->mb_width * 8 + EDGE_WIDTH; for(i=0;i<3;i++) { - int w, h, shift, pict_start, size; + int w, h, shift, pict_start; + unsigned size; w = s->linesize; h = s->mb_height * 16 + 2 * EDGE_WIDTH; diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c index e5e760238f..f92a61031f 100644 --- a/libavcodec/svq1.c +++ b/libavcodec/svq1.c @@ -591,7 +591,7 @@ static vlc_code_t svq1_inter_mean_table_5[292] = { } #define SVQ1_CALC_CODEBOOK_ENTRIES(cbook)\ - codebook = (uint32_t *) cbook[level];\ + codebook = (const uint32_t *) cbook[level];\ bit_cache = get_bits (bitbuf, 4*stages);\ /* calculate codebook entries for this vector */\ for (j=0; j < stages; j++) {\ @@ -605,11 +605,11 @@ static int svq1_decode_block_intra (bit_buffer_t *bitbuf, uint8_t *pixels, int p vlc_code_t *vlc; uint8_t *list[63]; uint32_t *dst; - uint32_t *codebook; + const uint32_t *codebook; int entries[6]; int i, j, m, n; int mean, stages; - int x, y, width, height, level; + unsigned x, y, width, height, level; uint32_t n1, n2, n3, n4; /* initialize list for breadth first processing of vectors */ @@ -681,7 +681,7 @@ static int svq1_decode_block_non_intra (bit_buffer_t *bitbuf, uint8_t *pixels, i vlc_code_t *vlc; uint8_t *list[63]; uint32_t *dst; - uint32_t *codebook; + const uint32_t *codebook; int entries[6]; int i, j, m, n; int mean, stages; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 77e4e750d6..6797508e1b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -20,7 +20,7 @@ #include "dsputil.h" #include "mpegvideo.h" -void *av_mallocz(int size) +void *av_mallocz(unsigned int size) { void *ptr; ptr = av_malloc(size);