Originally committed as revision 101 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -1178,7 +1178,7 @@ int mpeg4_decode_picture_header(MpegEncContext * s) | |||||
| skip_bits1(&s->gb); /* marker */ | skip_bits1(&s->gb); /* marker */ | ||||
| time_increment_resolution = get_bits(&s->gb, 16); | 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) | if (s->time_increment_bits < 1) | ||||
| s->time_increment_bits = 1; | s->time_increment_bits = 1; | ||||
| skip_bits1(&s->gb); /* marker */ | skip_bits1(&s->gb); /* marker */ | ||||
| @@ -317,7 +317,7 @@ static void filter(MpegAudioContext *s, int ch, short *samples, int incr) | |||||
| for(i=0;i<32;i++) { | for(i=0;i<32;i++) { | ||||
| norm |= abs(tmp1[i]); | norm |= abs(tmp1[i]); | ||||
| } | } | ||||
| n = log2(norm) - 12; | |||||
| n = av_log2(norm) - 12; | |||||
| if (n > 0) { | if (n > 0) { | ||||
| for(i=0;i<32;i++) | for(i=0;i<32;i++) | ||||
| tmp1[i] >>= n; | 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 */ | /* compute the scale factor index using log 2 computations */ | ||||
| if (vmax > 0) { | if (vmax > 0) { | ||||
| n = log2(vmax); | |||||
| n = av_log2(vmax); | |||||
| /* n is the position of the MSB of vmax. now | /* n is the position of the MSB of vmax. now | ||||
| use at most 2 compares to find the index */ | use at most 2 compares to find the index */ | ||||
| index = (21 - n) * 3 - 3; | index = (21 - n) * 3 - 3; | ||||