[FFmpeg-cvslog] mpegaudiodec: replace assert() by check under #ifdef DEBUG

Michael Niedermayer git at videolan.org
Tue Aug 7 04:46:08 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  7 04:38:44 2012 +0200| [29d1df66adb3723d1e7f2d363984b50792fb7c11] | committer: Michael Niedermayer

mpegaudiodec: replace assert() by check under #ifdef DEBUG

The assert can be false with some invalid inputs, the check is
too expensive to always do though for just a warning message.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29d1df66adb3723d1e7f2d363984b50792fb7c11
---

 libavcodec/mpegaudiodec.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 25a3975..bcdbc5f 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -263,7 +263,10 @@ static inline int l3_unscale(int value, int exponent)
     e  = table_4_3_exp  [4 * value + (exponent & 3)];
     m  = table_4_3_value[4 * value + (exponent & 3)];
     e -= exponent >> 2;
-    assert(e >= 1);
+#ifdef DEBUG
+    if(e < 1)
+        av_log(0, AV_LOG_WARNING, "l3_unscale: e is %d\n", e);
+#endif
     if (e > 31)
         return 0;
     m = (m + (1 << (e - 1))) >> e;



More information about the ffmpeg-cvslog mailing list