diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-07-09 17:22:59 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-07-09 17:22:59 +0000 |
| commit | 988c170547da735163a297e1c213922ad21fdbda (patch) | |
| tree | 97ac0f8292dfddd9b2786e7385d29ed5a882571a /libavcodec/aacpsy.c | |
| parent | 181b3363043fae8ff05803f792c1cdd8cafd8c41 (diff) | |
| download | ffmpeg-988c170547da735163a297e1c213922ad21fdbda.tar.gz | |
Change fminf/fmaxf to FFMIN/FFMAX to fix the build on broken operating systems.
Originally committed as revision 19391 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aacpsy.c')
| -rw-r--r-- | libavcodec/aacpsy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index f7e73403e9..1200134baf 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -141,7 +141,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) { 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 @@ static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, 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); |