[SCM] libav/experimental: Add av_popcount() to libavutil/common.h and bump minor version

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bc6f0af289b4e43ff745db6f4ea4bc508d19453e
Author: Tomas Härdin <tomas.hardin at codemill.se>
Date:   Tue Sep 14 14:45:43 2010 +0000

    Add av_popcount() to libavutil/common.h and bump minor version
    
    Originally committed as revision 25120 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index c51a682..0b0b4ce 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -40,7 +40,7 @@
 #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
 
 #define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR 26
+#define LIBAVUTIL_VERSION_MINOR 27
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libavutil/common.h b/libavutil/common.h
index d054f87..6404076 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -192,6 +192,20 @@ static inline av_const int av_ceil_log2_c(int x)
     return av_log2((x - 1) << 1);
 }
 
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static inline av_const int av_popcount_c(uint32_t x)
+{
+    x -= (x >> 1) & 0x55555555;
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    x = (x + (x >> 4)) & 0x0F0F0F0F;
+    x += x >> 8;
+    return (x + (x >> 16)) & 0x3F;
+}
+
 #define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24))
 #define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((a) << 24))
 
@@ -351,3 +365,6 @@ static inline av_const int av_ceil_log2_c(int x)
 #ifndef av_clipf
 #   define av_clipf         av_clipf_c
 #endif
+#ifndef av_popcount
+#   define av_popcount      av_popcount_c
+#endif

-- 
Libav/FFmpeg packaging