aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2010-05-14 19:38:17 +0000
committerAlex Converse <alex.converse@gmail.com>2010-05-14 19:38:17 +0000
commit0175d7886f005be878e07bbbfe2bcb5e9f0398f3 (patch)
tree5295efdfc7852091ab379a59f5898db016a490bc
parentdeeb7012b9998dac57ea7ef25462ada43bef7c3d (diff)
downloadffmpeg-0175d7886f005be878e07bbbfe2bcb5e9f0398f3.tar.gz
fmaxf -> FFMAX to fix pre-C99 systems
Originally committed as revision 23138 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aaccoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index 706f6ac9e6..e579eb72af 100644
--- a/libavcodec/aaccoder.c
+++ b/libavcodec/aaccoder.c
@@ -679,7 +679,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
int qmaxval;
for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
for (i = 0; i < sce->ics.swb_sizes[g]; i++) {
- maxval = fmaxf(maxval, scaled[w2*128+i]);
+ maxval = FFMAX(maxval, scaled[w2*128+i]);
}
}
qmaxval = maxval * Q34 + 0.4054;