From f9f7210e5ebe35308112e6144afb0054c7725719 Mon Sep 17 00:00:00 2001
From: Vitor Sessak <vitor1001@gmail.com>
Date: Sun, 7 Sep 2008 13:46:09 +0000
Subject: [PATCH] Use FFMIN() instead of rewriting it.

Originally committed as revision 15248 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/mace.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index 79e9b30ef1..dced77da1f 100644
--- 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;