libwebp-0.6.0-rc1

third_party/libwebp/enc/token_enc.c

Index: third_party/libwebp/enc/token_enc.c
diff --git a/third_party/libwebp/enc/token.c b/third_party/libwebp/enc/token_enc.c
similarity index 98%
rename from third_party/libwebp/enc/token.c
rename to third_party/libwebp/enc/token_enc.c
index 087940e5ffdc260032c8cad17ff157f6cac76d72..02a0d72cc6d712bd380145663c92d1123343d82a 100644
--- a/third_party/libwebp/enc/token.c
+++ b/third_party/libwebp/enc/token_enc.c
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "./cost.h"
-#include "./vp8enci.h"
+#include "./cost_enc.h"
+#include "./vp8i_enc.h"
 #include "../utils/utils.h"
 
 #if !defined(DISABLE_TOKEN_BUFFER)
@@ -137,8 +137,9 @@ int VP8RecordCoeffTokens(int ctx, const struct VP8Residual* const res,
       s = res->stats[VP8EncBands[n]][1];
     } else {
       if (!AddToken(tokens, v > 4, base_id + 3, s + 3)) {
-        if (AddToken(tokens, v != 2, base_id + 4, s + 4))
+        if (AddToken(tokens, v != 2, base_id + 4, s + 4)) {
           AddToken(tokens, v == 4, base_id + 5, s + 5);
+        }
       } else if (!AddToken(tokens, v > 10, base_id + 6, s + 6)) {
         if (!AddToken(tokens, v > 6, base_id + 7, s + 7)) {
           AddConstantToken(tokens, v == 6, 159);