Revision 07787186

View differences:

libavcodec/i386/mpegvideo_mmx.c
195 195
    const UINT16 *quant_matrix;
196 196
    
197 197
    if(s->alternate_scan) nCoeffs= 64;
198
    else nCoeffs= nCoeffs= zigzag_end[ s->block_last_index[n] ];
198
    else nCoeffs= zigzag_end[ s->block_last_index[n] ];
199 199

  
200 200
    if (s->mb_intra) {
201 201
        int block0;
......
321 321
    const UINT16 *quant_matrix;
322 322
    
323 323
    if(s->alternate_scan) nCoeffs= 64;
324
    else nCoeffs= nCoeffs= zigzag_end[ s->block_last_index[n] ];
324
    else nCoeffs= zigzag_end[ s->block_last_index[n] ];
325 325

  
326 326
    if (s->mb_intra) {
327 327
        int block0;
libavcodec/motion_est.c
1399 1399
    int mx, my, mx2, my2;
1400 1400
    uint8_t *ref_picture= s->me_scratchpad - (mb_x - 1 + (mb_y - 1)*s->linesize)*16;
1401 1401
    int16_t (*mv_table)[2]= s->b_direct_mv_table;
1402
    uint16_t *mv_penalty= s->mv_penalty[s->f_code] + MAX_MV; // f_code of the prev frame
1402
/*    uint16_t *mv_penalty= s->mv_penalty[s->f_code] + MAX_MV; */ // f_code of the prev frame
1403 1403

  
1404 1404
    /* thanks to iso-mpeg the rounding is different for the zero vector, so we need to handle that ... */
1405 1405
    motion_fx= (motion_px*time_pb)/time_pp;
libavcodec/mpeg12.c
62 62

  
63 63
static void init_2d_vlc_rl(RLTable *rl)
64 64
{
65
    int i, q;
65
    int i;
66 66
    
67 67
    init_vlc(&rl->vlc, TEX_VLC_BITS, rl->n + 2, 
68 68
             &rl->table_vlc[0][1], 4, 2,
libavcodec/ratecontrol.c
279 279
        "avgTex",
280 280
        NULL
281 281
    };
282
    double (*func1[])(void *, double)={
282
    static double (*func1[])(void *, double)={
283 283
        bits2qp,
284 284
        qp2bits,
285 285
        NULL

Also available in: Unified diff