[FFmpeg-cvslog] g2meet: use av_ceil_log2 instead of a custom function

[Janne Grunau]

ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Wed Jul  1 13:58:34 2015 +0200| [9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a] | committer: Janne Grunau

g2meet: use av_ceil_log2 instead of a custom function

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a
---

 libavcodec/g2meet.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 600e2b2..af27a5d 100644
--- 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 {