Revision 18f77016

View differences:

libavcodec/avcodec.h
773 773
} AVCodecContext;
774 774

  
775 775
typedef struct AVCodec {
776
    char *name;
776
    const char *name;
777 777
    int type;
778 778
    int id;
779 779
    int priv_data_size;
......
1021 1021
int avcodec(void* handle, avc_cmd_t cmd, void* pin, void* pout);
1022 1022

  
1023 1023
/* memory */
1024
void *av_malloc(int size);
1025
void *av_mallocz(int size);
1024
void *av_malloc(unsigned int size);
1025
void *av_mallocz(unsigned int size);
1026 1026
void av_free(void *ptr);
1027 1027
void __av_freep(void **ptr);
1028 1028
#define av_freep(p) __av_freep((void **)(p))
libavcodec/common.c
133 133
    if(n) skip_bits(s, n);
134 134
}
135 135

  
136
int check_marker(GetBitContext *s, char *msg)
136
int check_marker(GetBitContext *s, const char *msg)
137 137
{
138 138
    int bit= get_bits1(s);
139 139
    if(!bit) printf("Marker bit missing %s\n", msg);
......
147 147

  
148 148
#define GET_DATA(v, table, i, wrap, size) \
149 149
{\
150
    UINT8 *ptr = (UINT8 *)table + i * wrap;\
150
    const UINT8 *ptr = (UINT8 *)table + i * wrap;\
151 151
    switch(size) {\
152 152
    case 1:\
153 153
        v = *(UINT8 *)ptr;\
libavcodec/common.h
639 639
void init_get_bits(GetBitContext *s,
640 640
                   UINT8 *buffer, int buffer_size);
641 641

  
642
int check_marker(GetBitContext *s, char *msg);
642
int check_marker(GetBitContext *s, const char *msg);
643 643
void align_get_bits(GetBitContext *s);
644 644
int init_vlc(VLC *vlc, int nb_bits, int nb_codes,
645 645
             const void *bits, int bits_wrap, int bits_size,
libavcodec/dsputil.h
131 131

  
132 132
#if defined(HAVE_MMX)
133 133

  
134
#undef emms_c()
134
#undef emms_c
135 135

  
136 136
#define MM_MMX    0x0001 /* standard MMX */
137 137
#define MM_3DNOW  0x0004 /* AMD 3DNOW */
libavcodec/dv.c
495 495
                                 UINT8 *buf, int buf_size)
496 496
{
497 497
    DVVideoDecodeContext *s = avctx->priv_data;
498
    int sct, dsf, apt, ds, nb_dif_segs, vs, size, width, height, i, packet_size;
498
    int sct, dsf, apt, ds, nb_dif_segs, vs, width, height, i, packet_size;
499
    unsigned size;
499 500
    UINT8 *buf_ptr;
500 501
    const UINT16 *mb_pos_ptr;
501 502
    AVPicture *picture;
libavcodec/mem.c
26 26
   linker will do it automatically */
27 27

  
28 28
/* memory alloc */
29
void *av_malloc(int size)
29
void *av_malloc(unsigned int size)
30 30
{
31 31
    void *ptr;
32 32
#if defined (HAVE_MEMALIGN)
libavcodec/mpegvideo.c
303 303
      s->uvlinesize = s->mb_width * 8  +     EDGE_WIDTH;
304 304

  
305 305
      for(i=0;i<3;i++) {
306
        int w, h, shift, pict_start, size;
306
	int w, h, shift, pict_start;
307
	unsigned size;
307 308

  
308 309
        w = s->linesize;
309 310
        h = s->mb_height * 16 + 2 * EDGE_WIDTH;
libavcodec/svq1.c
591 591
      }
592 592

  
593 593
#define SVQ1_CALC_CODEBOOK_ENTRIES(cbook)\
594
      codebook = (uint32_t *) cbook[level];\
594
      codebook = (const uint32_t *) cbook[level];\
595 595
      bit_cache = get_bits (bitbuf, 4*stages);\
596 596
      /* calculate codebook entries for this vector */\
597 597
      for (j=0; j < stages; j++) {\
......
605 605
  vlc_code_t *vlc;
606 606
  uint8_t    *list[63];
607 607
  uint32_t   *dst;
608
  uint32_t   *codebook;
608
  const uint32_t *codebook;
609 609
  int	      entries[6];
610 610
  int	      i, j, m, n;
611 611
  int	      mean, stages;
612
  int	      x, y, width, height, level;
612
  unsigned    x, y, width, height, level;
613 613
  uint32_t    n1, n2, n3, n4;
614 614

  
615 615
  /* initialize list for breadth first processing of vectors */
......
681 681
  vlc_code_t *vlc;
682 682
  uint8_t    *list[63];
683 683
  uint32_t   *dst;
684
  uint32_t   *codebook;
684
  const uint32_t *codebook;
685 685
  int	      entries[6];
686 686
  int	      i, j, m, n;
687 687
  int	      mean, stages;
libavcodec/utils.c
20 20
#include "dsputil.h"
21 21
#include "mpegvideo.h"
22 22

  
23
void *av_mallocz(int size)
23
void *av_mallocz(unsigned int size)
24 24
{
25 25
    void *ptr;
26 26
    ptr = av_malloc(size);

Also available in: Unified diff