# HG changeset patch # User vitor # Date 1212431344 0 # Node ID 3a148660d0be451a8a27f542b6e7594ca6ffde01 # Parent f855f314fb629b5b70038efaa5ee56989c39b5ff Remove warning that could never be triggered. Thanks Mkhodor for pointing it out. diff -r f855f314fb62 -r 3a148660d0be ra144.c --- a/ra144.c Mon Jun 02 14:54:19 2008 +0000 +++ b/ra144.c Mon Jun 02 18:29:04 2008 +0000 @@ -174,7 +174,7 @@ 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 @@ 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 @@ // 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 @@ 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);