diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 19:09:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 19:09:55 +0200 |
| commit | 6205143bb3feb132b40743d819865a083855213b (patch) | |
| tree | 19c9df467b27da50b3843da1937d726cd79064f5 | |
| parent | 92c858ae667a68cfbc79e5e38a027054ddf69c1b (diff) | |
| parent | 9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a (diff) | |
| download | ffmpeg-streaming-6205143bb3feb132b40743d819865a083855213b.zip ffmpeg-streaming-6205143bb3feb132b40743d819865a083855213b.tar.gz | |
Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'
* commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a':
g2meet: use av_ceil_log2 instead of a custom function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/g2meet.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 9cc6050..644d0a2 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -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 { |
