|
|
|
@ -2387,7 +2387,7 @@ static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded |
|
|
|
|
GetBitContext *gb = &v->s.gb; |
|
|
|
|
MpegEncContext *s = &v->s; |
|
|
|
|
int dc_pred_dir = 0; /* Direction of the DC prediction used */ |
|
|
|
|
int run_diff, i; |
|
|
|
|
int i; |
|
|
|
|
int16_t *dc_val; |
|
|
|
|
int16_t *ac_val, *ac_val2; |
|
|
|
|
int dcdiff; |
|
|
|
@ -2433,7 +2433,6 @@ static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded |
|
|
|
|
block[0] = dcdiff * s->c_dc_scale; |
|
|
|
|
} |
|
|
|
|
/* Skip ? */ |
|
|
|
|
run_diff = 0; |
|
|
|
|
if (!coded) { |
|
|
|
|
goto not_coded; |
|
|
|
|
} |
|
|
|
@ -2554,7 +2553,7 @@ static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int c |
|
|
|
|
GetBitContext *gb = &v->s.gb; |
|
|
|
|
MpegEncContext *s = &v->s; |
|
|
|
|
int dc_pred_dir = 0; /* Direction of the DC prediction used */ |
|
|
|
|
int run_diff, i; |
|
|
|
|
int i; |
|
|
|
|
int16_t *dc_val; |
|
|
|
|
int16_t *ac_val, *ac_val2; |
|
|
|
|
int dcdiff; |
|
|
|
@ -2604,8 +2603,6 @@ static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int c |
|
|
|
|
} else { |
|
|
|
|
block[0] = dcdiff * s->c_dc_scale; |
|
|
|
|
} |
|
|
|
|
/* Skip ? */ |
|
|
|
|
run_diff = 0; |
|
|
|
|
|
|
|
|
|
//AC Decoding
|
|
|
|
|
i = 1; |
|
|
|
@ -2751,7 +2748,7 @@ static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int c |
|
|
|
|
GetBitContext *gb = &v->s.gb; |
|
|
|
|
MpegEncContext *s = &v->s; |
|
|
|
|
int dc_pred_dir = 0; /* Direction of the DC prediction used */ |
|
|
|
|
int run_diff, i; |
|
|
|
|
int i; |
|
|
|
|
int16_t *dc_val; |
|
|
|
|
int16_t *ac_val, *ac_val2; |
|
|
|
|
int dcdiff; |
|
|
|
@ -2809,8 +2806,6 @@ static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int c |
|
|
|
|
} else { |
|
|
|
|
block[0] = dcdiff * s->c_dc_scale; |
|
|
|
|
} |
|
|
|
|
/* Skip ? */ |
|
|
|
|
run_diff = 0; |
|
|
|
|
|
|
|
|
|
//AC Decoding
|
|
|
|
|
i = 1; |
|
|
|
|