Commit 6205143b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '9eec23b8'

* commit '9eec23b8':
  g2meet: use av_ceil_log2 instead of a custom function
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 92c858ae 9eec23b8
......@@ -387,16 +387,6 @@ static int jpg_decode_data(JPGContext *c, int width, int height,
#define G_shift 8
#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 */
static int djb2_hash(uint32_t key)
{
......@@ -702,7 +692,7 @@ static int epic_decode_run_length(ePICContext *dc, int x, int y, int tile_width,
if (!(above_row[pos] == pix))
break;
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]))
*pRun += run;
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment