Commit 18f77016 authored by Zdenek Kabelac's avatar Zdenek Kabelac
Browse files

* fixing some minor const warnings

Originally committed as revision 1205 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 92ddb692
......@@ -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))
......
......@@ -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;\
......
......@@ -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,
......
......@@ -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 */
......
......@@ -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;
......
......@@ -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)
......
......@@ -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;
......
......@@ -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;
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment