History

lavu: check that assert level is defined

fix warning

Michael Niedermayer committed 13 years ago

Commit f27eb1b1 parent 14d50c11 file · +3 −3Browse files

Unified · Split

libavutil/common.h+3−3
@@ -97,7 +97,7 @@ av_const int av_log2_16bit(unsigned v); · 96 unmodified lines
9797 */
9898 static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
9999 {
100−#if defined(HAVE_AV_CONFIG_H) && ASSERT_LEVEL >= 2
100+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
101101 if (amin > amax) abort();
102102 #endif
103103 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) · 10 unmodified lines
114114 */
115115 static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax)
116116 {
117−#if defined(HAVE_AV_CONFIG_H) && ASSERT_LEVEL >= 2
117+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
118118 if (amin > amax) abort();
119119 #endif
120120 if (a < amin) return amin;
@@ -222,7 +222,7 @@ static av_always_inline int av_sat_dadd32_c(int a, int b) · 101 unmodified lines
222222 */
223223 static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
224224 {
225−#if defined(HAVE_AV_CONFIG_H) && ASSERT_LEVEL >= 2
225+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
226226 if (amin > amax) abort();
227227 #endif
228228 if (a < amin) return amin;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t