aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-05 11:19:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-05 12:21:39 +0100
commitf27eb1b702d88f0ead83f161c835d69210aa007c (patch)
tree01c79e6559d7cb06aa9d1430b9af9b48fb1948b1
parent14d50c19dc56dc5be5dfcd699b29f6275735fc1e (diff)
downloadffmpeg-f27eb1b702d88f0ead83f161c835d69210aa007c.tar.gz
lavu: check that assert level is defined
fix warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index 3adb1f0c06..778c757b69 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;