[SCM] libav/experimental: factorize &

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f39c3c885599a3a30abbbca698480b033670ec86
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Mar 26 00:54:29 2007 +0000

    factorize &
    
    Originally committed as revision 8525 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c
index 238c38c..6bc0b9a 100644
--- a/libavcodec/lzw.c
+++ b/libavcodec/lzw.c
@@ -78,17 +78,17 @@ static int lzw_get_code(struct LZWState * s)
             s->bbits += 8;
             s->bs--;
         }
-        c = s->bbuf & s->curmask;
+        c = s->bbuf;
         s->bbuf >>= s->cursize;
     } else { // TIFF
         while (s->bbits < s->cursize) {
             s->bbuf = (s->bbuf << 8) | (*s->pbuf++);
             s->bbits += 8;
         }
-        c = (s->bbuf >> (s->bbits - s->cursize)) & s->curmask;
+        c = s->bbuf >> (s->bbits - s->cursize);
     }
     s->bbits -= s->cursize;
-    return c;
+    return c & s->curmask;
 }
 
 uint8_t* ff_lzw_cur_ptr(LZWState *p)

-- 
Libav/FFmpeg packaging