diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2001-08-15 13:11:31 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2001-08-15 13:11:31 +0000 |
| commit | 935442b522dc198da6d73b58fc1236ef97278ca9 (patch) | |
| tree | f74a7e306a2a745ffcf9c580798e2e20861e5d10 | |
| parent | 0c23ead1154cc4c35586574b2589a1049a53211f (diff) | |
| download | ffmpeg-935442b522dc198da6d73b58fc1236ef97278ca9.tar.gz | |
log2 to av_log2
Originally committed as revision 101 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudio.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 0cf59627dd..12f14db040 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -1178,7 +1178,7 @@ int mpeg4_decode_picture_header(MpegEncContext * s) skip_bits1(&s->gb); /* marker */ time_increment_resolution = get_bits(&s->gb, 16); - s->time_increment_bits = log2(time_increment_resolution - 1) + 1; + s->time_increment_bits = av_log2(time_increment_resolution - 1) + 1; if (s->time_increment_bits < 1) s->time_increment_bits = 1; skip_bits1(&s->gb); /* marker */ diff --git a/libavcodec/mpegaudio.c b/libavcodec/mpegaudio.c index 7785257821..ec8c82de3e 100644 --- a/libavcodec/mpegaudio.c +++ b/libavcodec/mpegaudio.c @@ -317,7 +317,7 @@ static void filter(MpegAudioContext *s, int ch, short *samples, int incr) for(i=0;i<32;i++) { norm |= abs(tmp1[i]); } - n = log2(norm) - 12; + n = av_log2(norm) - 12; if (n > 0) { for(i=0;i<32;i++) tmp1[i] >>= n; @@ -364,7 +364,7 @@ static void compute_scale_factors(unsigned char scale_code[SBLIMIT], } /* compute the scale factor index using log 2 computations */ if (vmax > 0) { - n = log2(vmax); + n = av_log2(vmax); /* n is the position of the MSB of vmax. now use at most 2 compares to find the index */ index = (21 - n) * 3 - 3; |