Mercurial > libavcodec.hg
comparison aaccoder.c @ 11733:0c1f5ab77b36 libavcodec
fmaxf -> FFMAX to fix pre-C99 systems
author | alexc |
---|---|
date | Fri, 14 May 2010 19:38:17 +0000 |
parents | c40cc26cd23f |
children | 2167bf95c596 |
comparison
equal
deleted
inserted
replaced
11732:c40cc26cd23f | 11733:0c1f5ab77b36 |
---|---|
677 float Q = ff_aac_pow2sf_tab[200 - sce->sf_idx[w*16+g] + SCALE_ONE_POS - SCALE_DIV_512]; | 677 float Q = ff_aac_pow2sf_tab[200 - sce->sf_idx[w*16+g] + SCALE_ONE_POS - SCALE_DIV_512]; |
678 float Q34 = sqrtf(Q * sqrtf(Q)); | 678 float Q34 = sqrtf(Q * sqrtf(Q)); |
679 int qmaxval; | 679 int qmaxval; |
680 for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { | 680 for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { |
681 for (i = 0; i < sce->ics.swb_sizes[g]; i++) { | 681 for (i = 0; i < sce->ics.swb_sizes[g]; i++) { |
682 maxval = fmaxf(maxval, scaled[w2*128+i]); | 682 maxval = FFMAX(maxval, scaled[w2*128+i]); |
683 } | 683 } |
684 } | 684 } |
685 qmaxval = maxval * Q34 + 0.4054; | 685 qmaxval = maxval * Q34 + 0.4054; |
686 if (qmaxval == 0) cb = 0; | 686 if (qmaxval == 0) cb = 0; |
687 else if (qmaxval == 1) cb = 1; | 687 else if (qmaxval == 1) cb = 1; |