[FFmpeg-cvslog] lavu: check that assert level is defined

Michael Niedermayer git at videolan.org
Sat Jan 5 12:22:08 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  5 11:19:54 2013 +0100| [f27eb1b702d88f0ead83f161c835d69210aa007c] | committer: Michael Niedermayer

lavu: check that assert level is defined

fix warning

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

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

 libavutil/common.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavutil/common.h b/libavutil/common.h
index 3adb1f0..778c757 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -97,7 +97,7 @@ av_const int av_log2_16bit(unsigned v);
  */
 static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
 {
-#if defined(HAVE_AV_CONFIG_H) && ASSERT_LEVEL >= 2
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
     if (amin > amax) abort();
 #endif
     if      (a < amin) return amin;
@@ -114,7 +114,7 @@ static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
  */
 static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax)
 {
-#if defined(HAVE_AV_CONFIG_H) && ASSERT_LEVEL >= 2
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
     if (amin > amax) abort();
 #endif
     if      (a < amin) return amin;
@@ -222,7 +222,7 @@ static av_always_inline int av_sat_dadd32_c(int a, int b)
  */
 static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
 {
-#if defined(HAVE_AV_CONFIG_H) && ASSERT_LEVEL >= 2
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
     if (amin > amax) abort();
 #endif
     if      (a < amin) return amin;



More information about the ffmpeg-cvslog mailing list