add 'all' and 'none' options for partitions config

[ffmpeg] / libavcodec / lzw.c

diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c
index 24b8194ac18549e18ac1f0fe6d46e0fce573f8ac..6bc0b9a48a2bac009339dbc561a8f1abd2ce8760 100644 (file)
--- 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)
@@ -152,16 +152,7 @@ int ff_lzw_decode_init(LZWState *p, int csize, uint8_t *buf, int buf_size, int m
     s->sp = s->stack;
 
     s->mode = mode;
-    switch(s->mode){
-    case FF_LZW_GIF:
-        s->extra_slot= 0;
-        break;
-    case FF_LZW_TIFF:
-        s->extra_slot= 1;
-        break;
-    default:
-        return -1;
-    }
+    s->extra_slot = s->mode == FF_LZW_TIFF;
     return 0;
 }