Revision 79396ac6

View differences:

libavcodec/i386/dsputil_mmx.c
1080 1080
      return tmp + hf_noise8_mmx(pix+8, line_size, h);
1081 1081
}
1082 1082

  
1083
static int nsse16_mmx(MpegEncContext *c, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
1083
static int nsse16_mmx(void *p, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
1084
    MpegEncContext *c = p;
1084 1085
    int score1= sse16_mmx(c, pix1, pix2, line_size, h);
1085 1086
    int score2= hf_noise16_mmx(pix1, line_size, h) - hf_noise16_mmx(pix2, line_size, h);
1086 1087

  
......
1088 1089
    else  return score1 + ABS(score2)*8;
1089 1090
}
1090 1091

  
1091
static int nsse8_mmx(MpegEncContext *c, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
1092
static int nsse8_mmx(void *p, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
1093
    MpegEncContext *c = p;
1092 1094
    int score1= sse8_mmx(c, pix1, pix2, line_size, h);
1093 1095
    int score2= hf_noise8_mmx(pix1, line_size, h) - hf_noise8_mmx(pix2, line_size, h);
1094 1096

  
libavcodec/i386/dsputil_mmx_rnd.h
55 55
	:REG_a, "memory");
56 56
}
57 57

  
58
static void DEF(put, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
58
static void attribute_unused DEF(put, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
59 59
{
60 60
    MOVQ_BFE(mm6);
61 61
    __asm __volatile(
......
151 151
	:REG_a, "memory");
152 152
}
153 153

  
154
static void DEF(put, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
154
static void attribute_unused DEF(put, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
155 155
{
156 156
    MOVQ_BFE(mm6);
157 157
    __asm __volatile(
......
296 296
}
297 297

  
298 298
// avg_pixels
299
static void DEF(avg, pixels4)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
299
static void attribute_unused DEF(avg, pixels4)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
300 300
{
301 301
    MOVQ_BFE(mm6);
302 302
    JUMPALIGN();
libavcodec/parser.c
159 159
        }
160 160
    }
161 161

  
162
    *poutbuf= buf;
162
    /* cast to avoid warning about discarding qualifiers */
163
    *poutbuf= (uint8_t *) buf;
163 164
    *poutbuf_size= buf_size;
164 165
    if(avctx->extradata){
165 166
        if(  (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))
libavcodec/pnm.c
473 473
        pnmctx.bytestream_end= pc->buffer + pc->index;
474 474
    }else{
475 475
        pnmctx.bytestream_start=
476
        pnmctx.bytestream= buf;
477
        pnmctx.bytestream_end= buf + buf_size;
476
        pnmctx.bytestream= (uint8_t *) buf; /* casts avoid warnings */
477
        pnmctx.bytestream_end= (uint8_t *) buf + buf_size;
478 478
    }
479 479
    if(pnm_decode_header(avctx, &pnmctx) < 0){
480 480
        if(pnmctx.bytestream < pnmctx.bytestream_end){
libavcodec/rangecoder.c
49 49
}
50 50

  
51 51
void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){
52
    ff_init_range_encoder(c, buf, buf_size);
52
    /* cast to avoid compiler warning */
53
    ff_init_range_encoder(c, (uint8_t *) buf, buf_size);
53 54

  
54 55
    c->low =(*c->bytestream++)<<8;
55 56
    c->low+= *c->bytestream++;
libavcodec/vp3dsp.c
25 25
#include "common.h"
26 26
#include "avcodec.h"
27 27
#include "dsputil.h"
28
#include "vp3data.h"
29 28

  
30 29
#define IdctAdjustBeforeShift 8
31 30
#define xC1S7 64277
libavformat/avidec.c
366 366
    }
367 367
    
368 368
    if(avi->non_interleaved){
369
        int best_stream_index;
369
        int best_stream_index = 0;
370 370
        AVStream *best_st= NULL;
371 371
        AVIStream *best_ast;
372 372
        int64_t best_ts= INT64_MAX;
libavformat/movenc.c
432 432
        if (track->enc->codec_id == CODEC_ID_AAC)
433 433
        {
434 434
            track->vosLen = 2;
435
            track->vosData = PSPAACData;
435
            track->vosData = (uint8_t *) PSPAACData;
436 436
        }
437 437

  
438 438
        if (track->enc->codec_id == CODEC_ID_MPEG4)
439 439
        {
440 440
            track->vosLen = 28;
441
            track->vosData = PSPMP4Data;
441
            track->vosData = (uint8_t *) PSPMP4Data;
442 442
        }
443 443
    }
444 444

  
libavformat/mpegts.c
376 376
    const uint8_t *p, *p_end, *desc_list_end, *desc_end;
377 377
    int program_info_length, pcr_pid, pid, stream_type;
378 378
    int desc_list_len, desc_len, desc_tag;
379
    int comp_page, anc_page;
379
    int comp_page = 0, anc_page = 0; /* initialize to kill warnings */
380 380
    char language[4];
381 381
    
382 382
#ifdef DEBUG_SI
libavformat/utils.c
981 981
        pktl = s->packet_buffer;
982 982
        if (pktl) {
983 983
            AVPacket *next_pkt= &pktl->pkt;
984
            AVStream *st= s->streams[ next_pkt->stream_index ];
985 984

  
986 985
            if(genpts && next_pkt->dts != AV_NOPTS_VALUE){
987 986
                while(pktl && next_pkt->pts == AV_NOPTS_VALUE){

Also available in: Unified diff