virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'

Browse Source 
* commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a':
  g2meet: use av_ceil_log2 instead of a custom function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-07-01 19:09:49 +02:00
commit 6205143bb3
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

@ -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 {