Use FFMIN() instead of rewriting it.

Originally committed as revision 15248 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago · f9f7210e5e
parent 42c7aeea67
commit f9f7210e5e
1 changed files with 1 additions and 4 deletions
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@ -284,10 +284,7 @@ static void chomp6(ChannelData *ctx, int16_t *output, uint8_t val,
    current = (short)tab2[(ctx->index & 0x7f0) >> 4][val];

    if ((ctx->previous ^ current) >= 0) {
-        if (ctx->factor + 506 > 32767)
-            ctx->factor = 32767;
-        else
-            ctx->factor += 506;
+        ctx->factor = FFMIN(ctx->factor + 506, 32767);
    } else {
        if (ctx->factor - 314 < -32768)
            ctx->factor = -32767;