Mercurial > libavcodec.hg
comparison lzw.c @ 4736:59649ebd5ed8 libavcodec
factorize &
author | michael |
---|---|
date | Mon, 26 Mar 2007 00:54:29 +0000 |
parents | 8903c1d6db18 |
children | dfdff1ca78a7 |
comparison
equal
deleted
inserted
replaced
4735:8903c1d6db18 | 4736:59649ebd5ed8 |
---|---|
76 } | 76 } |
77 s->bbuf |= (*s->pbuf++) << s->bbits; | 77 s->bbuf |= (*s->pbuf++) << s->bbits; |
78 s->bbits += 8; | 78 s->bbits += 8; |
79 s->bs--; | 79 s->bs--; |
80 } | 80 } |
81 c = s->bbuf & s->curmask; | 81 c = s->bbuf; |
82 s->bbuf >>= s->cursize; | 82 s->bbuf >>= s->cursize; |
83 } else { // TIFF | 83 } else { // TIFF |
84 while (s->bbits < s->cursize) { | 84 while (s->bbits < s->cursize) { |
85 s->bbuf = (s->bbuf << 8) | (*s->pbuf++); | 85 s->bbuf = (s->bbuf << 8) | (*s->pbuf++); |
86 s->bbits += 8; | 86 s->bbits += 8; |
87 } | 87 } |
88 c = (s->bbuf >> (s->bbits - s->cursize)) & s->curmask; | 88 c = s->bbuf >> (s->bbits - s->cursize); |
89 } | 89 } |
90 s->bbits -= s->cursize; | 90 s->bbits -= s->cursize; |
91 return c; | 91 return c & s->curmask; |
92 } | 92 } |
93 | 93 |
94 uint8_t* ff_lzw_cur_ptr(LZWState *p) | 94 uint8_t* ff_lzw_cur_ptr(LZWState *p) |
95 { | 95 { |
96 return ((struct LZWState*)p)->pbuf; | 96 return ((struct LZWState*)p)->pbuf; |