[SCM] libav/experimental: FFMAX

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3b6d23293caf0e909575cdcea89bc1c63112b290
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Oct 24 09:09:38 2006 +0000

    FFMAX
    
    Originally committed as revision 6785 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/jpeg_ls.c b/libavcodec/jpeg_ls.c
index 8dabcc0..b322ab7 100644
--- a/libavcodec/jpeg_ls.c
+++ b/libavcodec/jpeg_ls.c
@@ -77,9 +77,7 @@ static void ls_init_state(JLSState *state){
         state->limit = (4 * state->bpp) - state->qbpp;
 
     for(i = 0; i < 367; i++) {
-        state->A[i] = (state->range + 32) >> 6;
-        if(state->A[i] < 2)
-            state->A[i] = 2;
+        state->A[i] = FFMAX((state->range + 32) >> 6, 2);
         state->N[i] = 1;
     }
 

-- 
Libav/FFmpeg packaging