From 241f5eab32fc8e22fecbf1a1c3c2d0d878d1b352 Mon Sep 17 00:00:00 2001 From: Benjamin Larsson Date: Sat, 2 May 2009 09:12:03 +0000 Subject: [PATCH] Remove dead assignments found by CSA Originally committed as revision 18731 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263.c | 3 --- libavcodec/mpegvideo_enc.c | 3 --- libavcodec/vp3.c | 2 -- 3 files changed, 8 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 862e98c1eb..b445c9b589 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -2825,7 +2825,6 @@ static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, in uint8_t *scan_table) { int i, last_non_zero; - const RLTable *rl; uint8_t *len_tab; const int last_index = s->block_last_index[n]; int len=0; @@ -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); if(last_index<1) return len; i = 1; - rl = &rl_intra; len_tab = uni_mpeg4_intra_rl_len; } else { if(last_index<0) return 0; i = 0; - rl = &rl_inter; len_tab = uni_mpeg4_inter_rl_len; } diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index cca2f7fe05..fbabd06859 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3264,7 +3264,6 @@ static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? int n, int qscale){ int16_t rem[64]; DECLARE_ALIGNED_16(DCTELEM, d1[64]); - const int *qmat; const uint8_t *scantable= s->intra_scantable.scantable; const uint8_t *perm_scantable= s->intra_scantable.permutated; // unsigned int threshold1, threshold2; @@ -3308,7 +3307,6 @@ static int messed_sign=0; dc= block[0]*q; // block[0] = (block[0] + (q >> 1)) / q; start_i = 1; - qmat = s->q_intra_matrix[qscale]; // if(s->mpeg_quant || s->out_format == FMT_MPEG1) // bias= 1<<(QMAT_SHIFT-1); length = s->intra_ac_vlc_length; @@ -3316,7 +3314,6 @@ static int messed_sign=0; } else { dc= 0; start_i = 0; - qmat = s->q_inter_matrix[qscale]; length = s->inter_ac_vlc_length; last_length= s->inter_ac_vlc_last_length; } diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 40f802de9f..982ca2fb23 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -254,7 +254,6 @@ static int init_block_mapping(Vp3DecodeContext *s) int right_edge = 0; int bottom_edge = 0; int superblock_row_inc = 0; - int *hilbert = NULL; int mapping_index = 0; int current_macroblock; @@ -366,7 +365,6 @@ static int init_block_mapping(Vp3DecodeContext *s) current_height = 0; superblock_row_inc = s->macroblock_width - (s->y_superblock_width * 2 - s->macroblock_width); - hilbert = hilbert_walk_mb; mapping_index = 0; current_macroblock = -1; for (i = 0; i < s->u_superblock_start; i++) {