[FFmpeg-cvslog] r13629 - trunk/libavcodec/ra144.c

[vitor]

Author: vitor
Date: Mon Jun  2 20:29:04 2008
New Revision: 13629

Log:
Remove warning that could never be triggered.

Thanks Mkhodor for pointing it out.


Modified:
   trunk/libavcodec/ra144.c

Modified: trunk/libavcodec/ra144.c
==============================================================================
--- trunk/libavcodec/ra144.c	(original)
+++ trunk/libavcodec/ra144.c	Mon Jun  2 20:29:04 2008
@@ -174,7 +174,7 @@ static void final(const int16_t *i1, con
     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,
         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, i
         // 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(AVCodecCon
     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);