[SCM] libav/experimental: Use FFMIN() instead of rewriting it.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f9f7210e5ebe35308112e6144afb0054c7725719
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Sun Sep 7 13:46:09 2008 +0000

    Use FFMIN() instead of rewriting it.
    
    Originally committed as revision 15248 to svn://svn.ffmpeg.org/ffmpeg/trunk

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

-- 
Libav/FFmpeg packaging