Merge commit '711781d7a1714ea4eb0217eb1ba04811978c43d1'

[ffmpeg] / libavutil / intmath.h

diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index 20167230dfb69236ec9c51aeb0f01e428e016351..82193a6d7c692a8e37ddc2da4490eee3123fc06d 100644 (file)
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -96,6 +96,9 @@ static av_always_inline av_const int ff_log2_16bit_c(unsigned int v)
 #ifndef ff_ctzll
 #define ff_ctzll(v) __builtin_ctzll(v)
 #endif
+#ifndef ff_clz
+#define ff_clz(v) __builtin_clz(v)
+#endif
 #endif
 #endif
 
@@ -135,6 +138,21 @@ static av_always_inline av_const int ff_ctzll_c(long long v)
 }
 #endif
 
+#ifndef ff_clz
+#define ff_clz ff_clz_c
+static av_always_inline av_const unsigned ff_clz_c(unsigned x)
+{
+    unsigned i = sizeof(x) * 8;
+
+    while (x) {
+        x >>= 1;
+        i--;
+    }
+
+    return i;
+}
+#endif
+
 /**
  * @}
  */