OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ccccd6
)
g2meet: use av_ceil_log2 instead of a custom function
author
Janne Grunau
<janne-libav@jannau.net>
Wed, 1 Jul 2015 11:58:34 +0000
(13:58 +0200)
committer
Janne Grunau
<janne-libav@jannau.net>
Wed, 1 Jul 2015 11:58:34 +0000
(13:58 +0200)
libavcodec/g2meet.c
patch
|
blob
|
history
diff --git
a/libavcodec/g2meet.c
b/libavcodec/g2meet.c
index
600e2b2
..
af27a5d
100644
(file)
--- a/
libavcodec/g2meet.c
+++ b/
libavcodec/g2meet.c
@@
-386,16
+386,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)
{
@@
-701,7
+691,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 {