virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Use FFMIN() instead of rewriting it.

Browse Source 
Originally committed as revision 15248 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-09-07 13:46:09 +00:00
parent 42c7aeea67
commit f9f7210e5e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mace.c
View File

@ -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;