From 27ee9bcf369a4e5ef929095fae414e1d7a6fdab9 Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Mon, 2 Jun 2008 18:29:04 +0000 Subject: [PATCH] Remove warning that could never be triggered. Thanks Mkhodor for pointing it out. Originally committed as revision 13629 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ra144.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 95d9e70..ac5caa5 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -174,7 +174,7 @@ static void final(const int16_t *i1, const int16_t *i2, memcpy(statbuf, work + 40, 20); } -static unsigned int rms(const int *data, int f, RA144Context *ractx) +static unsigned int rms(const int *data, int f) { int x; unsigned int res = 0x10000; @@ -186,11 +186,6 @@ static unsigned int rms(const int *data, int f, RA144Context *ractx) if (res == 0) return 0; - if (res > 0x10000) { - av_log(ractx, AV_LOG_ERROR, "Overflow. Broken sample?\n"); - return 0; - } - while (res <= 0x3fff) { b++; res <<= 2; @@ -319,13 +314,13 @@ static int interp(RA144Context *ractx, int16_t *decsp, int block_num, // coefficients if (copynew) { int_to_int16(decsp, ractx->lpc_coef); - return rms(ractx->lpc_refl, energy, ractx); + return rms(ractx->lpc_refl, energy); } else { int_to_int16(decsp, ractx->lpc_coef_old); - return rms(ractx->lpc_refl_old, energy, ractx); + return rms(ractx->lpc_refl_old, energy); } } else { - return rms(work, energy, ractx); + return rms(work, energy); } } @@ -363,7 +358,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, refl_rms[1] = interp(ractx, block_coefs[1], 1, energy > ractx->old_energy, t_sqrt(energy*ractx->old_energy) >> 12); refl_rms[2] = interp(ractx, block_coefs[2], 2, 1, energy); - refl_rms[3] = rms(ractx->lpc_refl, energy, ractx); + refl_rms[3] = rms(ractx->lpc_refl, energy); int_to_int16(block_coefs[3], ractx->lpc_coef); -- 2.7.4