RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 11:22:14 +00:00
Code Issues Projects Releases Wiki Activity

g2meet: use av_ceil_log2 instead of a custom function

Browse Source
This commit is contained in:
Janne Grunau 2015-07-01 13:58:34 +02:00
parent 4ccccd6c40
commit 9eec23b8a7
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/g2meet.c
View File

@ -386,16 +386,6 @@ static int jpg_decode_data(JPGContext *c, int width, int height,
#define G_shift 8 #define G_shift 8
#define B_shift 0 #define B_shift 0
static inline int log2_ceil(uint32_t x)
{
int c = 0;
for (--x; x > 0; x >>= 1)
c++;
return c;
}
/* improved djb2 hash from http://www.cse.yorku.ca/~oz/hash.html */ /* improved djb2 hash from http://www.cse.yorku.ca/~oz/hash.html */
static int djb2_hash(uint32_t key) static int djb2_hash(uint32_t key)
{ {
@ -701,7 +691,7 @@ static int epic_decode_run_length(ePICContext *dc, int x, int y, int tile_width,
if (!(above_row[pos] == pix)) if (!(above_row[pos] == pix))
break; break;
run = pos - start_pos - 1; run = pos - start_pos - 1;
idx = log2_ceil(run); idx = av_ceil_log2(run);
if (ff_els_decode_bit(&dc->els_ctx, &dc->prev_row_rung[idx])) if (ff_els_decode_bit(&dc->els_ctx, &dc->prev_row_rung[idx]))
*pRun += run; *pRun += run;
else { else {