# HG changeset patch # User kostya # Date 1240291490 0 # Node ID d8e5002210cb510e35fea83e269987996a5500c5 # Parent c9c23894f4ae3c72491bc0b0acddd9ce4451928e Remove some useless assignments and variables found by Clang diff -r c9c23894f4ae -r d8e5002210cb vc1.c --- a/vc1.c Tue Apr 21 04:42:27 2009 +0000 +++ b/vc1.c Tue Apr 21 05:24:50 2009 +0000 @@ -412,7 +412,7 @@ MpegEncContext *s = &v->s; DSPContext *dsp = &v->s.dsp; uint8_t *srcY, *srcU, *srcV; - int dxy, uvdxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y; + int dxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y; if(!v->s.last_picture.data[0])return; @@ -543,7 +543,6 @@ if(s->flags & CODEC_FLAG_GRAY) return; /* Chroma MC always uses qpel bilinear */ - uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); uvmx = (uvmx&3)<<1; uvmy = (uvmy&3)<<1; if(!v->rnd){ @@ -648,7 +647,7 @@ MpegEncContext *s = &v->s; DSPContext *dsp = &v->s.dsp; uint8_t *srcU, *srcV; - int uvdxy, uvmx, uvmy, uvsrc_x, uvsrc_y; + int uvmx, uvmy, uvsrc_x, uvsrc_y; int i, idx, tx = 0, ty = 0; int mvx[4], mvy[4], intra[4]; static const int count[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4}; @@ -763,7 +762,6 @@ } /* Chroma MC always uses qpel bilinear */ - uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); uvmx = (uvmx&3)<<1; uvmy = (uvmy&3)<<1; if(!v->rnd){ @@ -1209,7 +1207,6 @@ else if(v->pq < 13) v->tt_index = 1; else v->tt_index = 2; - lowquant = (v->pq > 12) ? 0 : 1; v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); v->s.mspel = v->s.quarter_sample; @@ -1461,7 +1458,6 @@ else if(v->pq < 13) v->tt_index = 1; else v->tt_index = 2; - lowquant = (v->pq > 12) ? 0 : 1; v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); v->s.mspel = v->s.quarter_sample; @@ -1755,7 +1751,7 @@ MpegEncContext *s = &v->s; DSPContext *dsp = &v->s.dsp; uint8_t *srcY, *srcU, *srcV; - int dxy, uvdxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y; + int dxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y; if(!v->s.next_picture.data[0])return; @@ -1854,7 +1850,6 @@ if(s->flags & CODEC_FLAG_GRAY) return; /* Chroma MC always uses qpel blilinear */ - uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); uvmx = (uvmx&3)<<1; uvmy = (uvmy&3)<<1; if(!v->rnd){ @@ -2197,15 +2192,11 @@ int a_avail, int c_avail, int16_t **dc_val_ptr, int *dir_ptr) { - int a, b, c, wrap, pred, scale; + int a, b, c, wrap, pred; int16_t *dc_val; int mb_pos = s->mb_x + s->mb_y * s->mb_stride; int q1, q2 = 0; - /* find prediction - wmv3_dc_scale always used here in fact */ - if (n < 4) scale = s->y_dc_scale; - else scale = s->c_dc_scale; - wrap = s->block_wrap[n]; dc_val= s->dc_val[0] + s->block_index[n]; @@ -2420,7 +2411,6 @@ } /* Skip ? */ run_diff = 0; - i = 0; if (!coded) { goto not_coded; } @@ -2492,6 +2482,7 @@ ac_val = s->ac_val[0][0] + s->block_index[n] * 16; ac_val2 = ac_val; + i = 0; scale = v->pq * 2 + v->halfpq; memset(ac_val2, 0, 16 * 2); if(dc_pred_dir) {//left @@ -2592,7 +2583,6 @@ } /* Skip ? */ run_diff = 0; - i = 0; //AC Decoding i = 1; @@ -2798,7 +2788,6 @@ } /* Skip ? */ run_diff = 0; - i = 0; //AC Decoding i = 1; @@ -3439,7 +3428,6 @@ cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); GET_MQUANT(); s->mb_intra = 0; - mb_has_coeffs = 0; s->current_picture.qscale_table[mb_pos] = mquant; if(!v->ttmbf) ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);