Mercurial > libavcodec.hg
diff aacpsy.c @ 9944:c5ca5e520fe1 libavcodec
Change fminf/fmaxf to FFMIN/FFMAX to fix the build on broken operating systems.
author | alexc |
---|---|
date | Thu, 09 Jul 2009 17:22:59 +0000 |
parents | 6c1ac45b3097 |
children | 7dd2a45249a9 |
line wrap: on
line diff
--- a/aacpsy.c Thu Jul 09 10:16:00 2009 +0000 +++ b/aacpsy.c Thu Jul 09 17:22:59 2009 +0000 @@ -141,7 +141,7 @@ for (g = 0; g < ctx->num_bands[j]; g++) { minscale = ath(ctx->avctx->sample_rate * start / 1024.0, ATH_ADD); for (i = 1; i < ctx->bands[j][g]; i++) - minscale = fminf(minscale, ath(ctx->avctx->sample_rate * (start + i) / 1024.0 / 2.0, ATH_ADD)); + minscale = FFMIN(minscale, ath(ctx->avctx->sample_rate * (start + i) / 1024.0 / 2.0, ATH_ADD)); coeffs->ath[g] = minscale - minath; start += ctx->bands[j][g]; } @@ -289,8 +289,8 @@ for (g = 0; g < num_bands; g++) { band[g].thr_quiet = FFMAX(band[g].thr, coeffs->ath[g]); if (wi->num_windows != 8 && wi->window_type[1] != EIGHT_SHORT_SEQUENCE) - band[g].thr_quiet = fmaxf(PSY_3GPP_RPEMIN*band[g].thr_quiet, - fminf(band[g].thr_quiet, + band[g].thr_quiet = FFMAX(PSY_3GPP_RPEMIN*band[g].thr_quiet, + FFMIN(band[g].thr_quiet, PSY_3GPP_RPELEV*pch->prev_band[w+g].thr_quiet)); band[g].thr = FFMAX(band[g].thr, band[g].thr_quiet * 0.25);