avutil: change GET_UTF8 to not use av_log2()
authorMans Rullgard <mans@mansr.com>
Tue, 13 Nov 2012 15:49:39 +0000 (15:49 +0000)
committerMans Rullgard <mans@mansr.com>
Wed, 14 Nov 2012 13:50:42 +0000 (13:50 +0000)
This removes an inter-library dependency on ff_log2_tab causing
linking errors in some configurations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
libavutil/common.h

index 3465863..cc4df16 100644 (file)
@@ -252,16 +252,17 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
 #define GET_UTF8(val, GET_BYTE, ERROR)\
     val= GET_BYTE;\
     {\
-        int ones= 7 - av_log2(val ^ 255);\
-        if(ones==1)\
+        uint32_t top = (val & 128) >> 1;\
+        if ((val & 0xc0) == 0x80)\
             ERROR\
-        val&= 127>>ones;\
-        while(--ones > 0){\
+        while (val & top) {\
             int tmp= GET_BYTE - 128;\
             if(tmp>>6)\
                 ERROR\
             val= (val<<6) + tmp;\
+            top <<= 5;\
         }\
+        val &= (top << 1) - 1;\
     }
 
 /**