Revision 1bd86246

View differences:

libavcodec/h264.c
5388 5388
};
5389 5389

  
5390 5390
static int decode_cabac_mb_cbp_luma( H264Context *h) {
5391
    MpegEncContext * const s = &h->s;
5392

  
5393 5391
    int cbp = 0;
5394 5392
    int cbp_b = -1;
5395 5393
    int i8x8;
libavcodec/mpegvideo.c
2230 2230
        input[i].linesize[2]= c->width/2;
2231 2231

  
2232 2232
        if(!i || s->input_picture[i-1])
2233
            img_resample(resample, &input[i], &pre_input);
2233
            img_resample(resample, (AVPicture*)&input[i],
2234
                         (AVPicture*)&pre_input);
2234 2235
    }
2235 2236

  
2236 2237
    for(j=0; j<s->max_b_frames+1; j++){
libavcodec/vorbis.c
1345 1345

  
1346 1346
                        AV_DEBUG("Classword: %d \n", temp);
1347 1347

  
1348
                        assert(vr->classifications > 1 && vr->classifications<256 && temp<=65536); //needed for inverse[]
1348
                        assert(vr->classifications > 1 && temp<=65536); //needed for inverse[]
1349 1349
                        for(i=0;i<c_p_c;++i) {
1350 1350
                            uint_fast32_t temp2;
1351 1351

  
libavcodec/vp3.c
328 328
    int bounding_values_array[256];
329 329
} Vp3DecodeContext;
330 330

  
331
static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb);
332 331
static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb);
333 332

  
334 333
/************************************************************************
......
2737 2736
    return ret;
2738 2737
}
2739 2738

  
2740
static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb)
2741
{
2742
    Vp3DecodeContext *s = avctx->priv_data;
2743
    int len;
2744

  
2745
    if (s->theora <= 0x030200)
2746
    {
2747
        int i, comments;
2748

  
2749
        // vendor string
2750
        len = get_bits_long(&gb, 32);
2751
        len = le2me_32(len);
2752
        while(len--)
2753
            skip_bits(&gb, 8);
2754

  
2755
        // user comments
2756
        comments = get_bits_long(&gb, 32);
2757
        comments = le2me_32(comments);
2758
        for (i = 0; i < comments; i++)
2759
        {
2760
            len = get_bits_long(&gb, 32);
2761
            len = be2me_32(len);
2762
            while(len--)
2763
                skip_bits(&gb, 8);
2764
        }
2765
    }
2766
    else
2767
    {
2768
        do {
2769
            len = get_bits_long(&gb, 32);
2770
            len = le2me_32(len);
2771
            if (len <= 0)
2772
                break;
2773
            while (len--)
2774
                skip_bits(&gb, 8);
2775
        } while (1);
2776
    }
2777
    return 0;
2778
}
2779

  
2780 2739
static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb)
2781 2740
{
2782 2741
    Vp3DecodeContext *s = avctx->priv_data;
libavformat/asf.c
376 376
        } else if (!memcmp(&g, &ext_stream_header, sizeof(GUID))) {
377 377
            int ext_len, payload_ext_ct, stream_ct;
378 378
            uint32_t ext_d;
379
            int64_t pos_ex_st, pos_curr;
379
            int64_t pos_ex_st;
380 380
            pos_ex_st = url_ftell(pb);
381 381

  
382 382
            get_le64(pb);

Also available in: Unified diff