summaryrefslogtreecommitdiff
path: root/libavcodec/qdm2.c
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2009-04-22 13:52:33 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2009-04-22 13:52:33 +0000
commit6c73a7d06cca1cbe9e51dab475ea4548dd850fcc (patch)
treecab15e48213c40aa5a95f52bffda542d66365710 /libavcodec/qdm2.c
parente4ddc8edfa33fb7952cabab08353ec7d9a17cc59 (diff)
Remove redundant code, found by CSA
Originally committed as revision 18661 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/qdm2.c')
-rw-r--r--libavcodec/qdm2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 25d0ec11cc..e3e4c78367 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -707,8 +707,7 @@ static void fill_coding_method_array (sb_int8_array tone_level_idx, sb_int8_arra
for (sb = 0; sb < 30; sb++)
for (j = 0; j < 64; j++)
acc += tone_level_idx_temp[ch][sb][j];
- if (acc)
- tmp = c * 256 / (acc & 0xffff);
+
multres = 0x66666667 * (acc * 10);
esp_40 = (multres >> 32) / 8 + ((multres & 0xffffffff) >> 31);
for (ch = 0; ch < nb_channels; ch++)
@@ -1835,7 +1834,6 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx)
extradata += 4;
s->checksum_size = AV_RB32(extradata);
- extradata += 4;
s->fft_order = av_log2(s->fft_size) + 1;
s->fft_frame_size = 2 * s->fft_size; // complex has two floats