Commit be4b6615 authored by banan's avatar banan

Remove dead assignments found by CSA

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18731 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 567ff75e
...@@ -2825,7 +2825,6 @@ static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, in ...@@ -2825,7 +2825,6 @@ static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, in
uint8_t *scan_table) uint8_t *scan_table)
{ {
int i, last_non_zero; int i, last_non_zero;
const RLTable *rl;
uint8_t *len_tab; uint8_t *len_tab;
const int last_index = s->block_last_index[n]; const int last_index = s->block_last_index[n];
int len=0; int len=0;
...@@ -2835,12 +2834,10 @@ static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, in ...@@ -2835,12 +2834,10 @@ static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, in
len += mpeg4_get_dc_length(intra_dc, n); len += mpeg4_get_dc_length(intra_dc, n);
if(last_index<1) return len; if(last_index<1) return len;
i = 1; i = 1;
rl = &rl_intra;
len_tab = uni_mpeg4_intra_rl_len; len_tab = uni_mpeg4_intra_rl_len;
} else { } else {
if(last_index<0) return 0; if(last_index<0) return 0;
i = 0; i = 0;
rl = &rl_inter;
len_tab = uni_mpeg4_inter_rl_len; len_tab = uni_mpeg4_inter_rl_len;
} }
......
...@@ -3264,7 +3264,6 @@ static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? ...@@ -3264,7 +3264,6 @@ static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise?
int n, int qscale){ int n, int qscale){
int16_t rem[64]; int16_t rem[64];
DECLARE_ALIGNED_16(DCTELEM, d1[64]); DECLARE_ALIGNED_16(DCTELEM, d1[64]);
const int *qmat;
const uint8_t *scantable= s->intra_scantable.scantable; const uint8_t *scantable= s->intra_scantable.scantable;
const uint8_t *perm_scantable= s->intra_scantable.permutated; const uint8_t *perm_scantable= s->intra_scantable.permutated;
// unsigned int threshold1, threshold2; // unsigned int threshold1, threshold2;
...@@ -3308,7 +3307,6 @@ static int messed_sign=0; ...@@ -3308,7 +3307,6 @@ static int messed_sign=0;
dc= block[0]*q; dc= block[0]*q;
// block[0] = (block[0] + (q >> 1)) / q; // block[0] = (block[0] + (q >> 1)) / q;
start_i = 1; start_i = 1;
qmat = s->q_intra_matrix[qscale];
// if(s->mpeg_quant || s->out_format == FMT_MPEG1) // if(s->mpeg_quant || s->out_format == FMT_MPEG1)
// bias= 1<<(QMAT_SHIFT-1); // bias= 1<<(QMAT_SHIFT-1);
length = s->intra_ac_vlc_length; length = s->intra_ac_vlc_length;
...@@ -3316,7 +3314,6 @@ static int messed_sign=0; ...@@ -3316,7 +3314,6 @@ static int messed_sign=0;
} else { } else {
dc= 0; dc= 0;
start_i = 0; start_i = 0;
qmat = s->q_inter_matrix[qscale];
length = s->inter_ac_vlc_length; length = s->inter_ac_vlc_length;
last_length= s->inter_ac_vlc_last_length; last_length= s->inter_ac_vlc_last_length;
} }
......
...@@ -254,7 +254,6 @@ static int init_block_mapping(Vp3DecodeContext *s) ...@@ -254,7 +254,6 @@ static int init_block_mapping(Vp3DecodeContext *s)
int right_edge = 0; int right_edge = 0;
int bottom_edge = 0; int bottom_edge = 0;
int superblock_row_inc = 0; int superblock_row_inc = 0;
int *hilbert = NULL;
int mapping_index = 0; int mapping_index = 0;
int current_macroblock; int current_macroblock;
...@@ -366,7 +365,6 @@ static int init_block_mapping(Vp3DecodeContext *s) ...@@ -366,7 +365,6 @@ static int init_block_mapping(Vp3DecodeContext *s)
current_height = 0; current_height = 0;
superblock_row_inc = s->macroblock_width - superblock_row_inc = s->macroblock_width -
(s->y_superblock_width * 2 - s->macroblock_width); (s->y_superblock_width * 2 - s->macroblock_width);
hilbert = hilbert_walk_mb;
mapping_index = 0; mapping_index = 0;
current_macroblock = -1; current_macroblock = -1;
for (i = 0; i < s->u_superblock_start; i++) { for (i = 0; i < s->u_superblock_start; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment