# HG changeset patch # User mru # Date 1140907291 0 # Node ID ede5c3c0a0eb9ca24b53a15417d297c02301920c # Parent 84406a59134cc29602f6796aedd4ddcc55728b7d kill some warnings diff -r 84406a59134c -r ede5c3c0a0eb h264.c --- a/h264.c Sat Feb 25 22:15:24 2006 +0000 +++ b/h264.c Sat Feb 25 22:41:31 2006 +0000 @@ -5388,8 +5388,6 @@ }; static int decode_cabac_mb_cbp_luma( H264Context *h) { - MpegEncContext * const s = &h->s; - int cbp = 0; int cbp_b = -1; int i8x8; diff -r 84406a59134c -r ede5c3c0a0eb mpegvideo.c --- a/mpegvideo.c Sat Feb 25 22:15:24 2006 +0000 +++ b/mpegvideo.c Sat Feb 25 22:41:31 2006 +0000 @@ -2230,7 +2230,8 @@ input[i].linesize[2]= c->width/2; if(!i || s->input_picture[i-1]) - img_resample(resample, &input[i], &pre_input); + img_resample(resample, (AVPicture*)&input[i], + (AVPicture*)&pre_input); } for(j=0; jmax_b_frames+1; j++){ diff -r 84406a59134c -r ede5c3c0a0eb vorbis.c --- a/vorbis.c Sat Feb 25 22:15:24 2006 +0000 +++ b/vorbis.c Sat Feb 25 22:41:31 2006 +0000 @@ -1345,7 +1345,7 @@ AV_DEBUG("Classword: %d \n", temp); - assert(vr->classifications > 1 && vr->classifications<256 && temp<=65536); //needed for inverse[] + assert(vr->classifications > 1 && temp<=65536); //needed for inverse[] for(i=0;ipriv_data; - int len; - - if (s->theora <= 0x030200) - { - int i, comments; - - // vendor string - len = get_bits_long(&gb, 32); - len = le2me_32(len); - while(len--) - skip_bits(&gb, 8); - - // user comments - comments = get_bits_long(&gb, 32); - comments = le2me_32(comments); - for (i = 0; i < comments; i++) - { - len = get_bits_long(&gb, 32); - len = be2me_32(len); - while(len--) - skip_bits(&gb, 8); - } - } - else - { - do { - len = get_bits_long(&gb, 32); - len = le2me_32(len); - if (len <= 0) - break; - while (len--) - skip_bits(&gb, 8); - } while (1); - } - return 0; -} - static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb) { Vp3DecodeContext *s = avctx->priv_data;