aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-03-26 00:54:29 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-03-26 00:54:29 +0000
commitf39c3c885599a3a30abbbca698480b033670ec86 (patch)
tree7d5cb21852a0c822bfd9ffa5021877b7d78e836a /libavcodec
parent0abfd533443a21334e5f9eb2833bc0d656714b6f (diff)
downloadffmpeg-f39c3c885599a3a30abbbca698480b033670ec86.tar.gz
factorize &
Originally committed as revision 8525 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/lzw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c
index 238c38cd82..6bc0b9a48a 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)