RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil: change GET_UTF8 to not use av_log2() 

This removes an inter-library dependency on ff_log2_tab causing
linking errors in some configurations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2012-11-13 15:49:39 +00:00
parent e8769b37fe
commit 7ba0c1b390
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/common.h
View 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)\ #define GET_UTF8(val, GET_BYTE, ERROR)\
val= GET_BYTE;\ val= GET_BYTE;\
{\ {\
int ones= 7 - av_log2(val ^ 255);\ uint32_t top = (val & 128) >> 1;\
if(ones==1)\ if ((val & 0xc0) == 0x80)\
ERROR\ ERROR\
val&= 127>>ones;\ while (val & top) {\
while(--ones > 0){\
int tmp= GET_BYTE - 128;\ int tmp= GET_BYTE - 128;\
if(tmp>>6)\ if(tmp>>6)\
ERROR\ ERROR\
val= (val<<6) + tmp;\ val= (val<<6) + tmp;\
top <<= 5;\
}\ }\
val &= (top << 1) - 1;\
} }
/** /**