]> granicus.if.org Git - libvpx/commitdiff
vp8/bitstream.c: rework #if to avoid dangling else
authorJames Zern <jzern@google.com>
Wed, 20 Jul 2016 06:02:34 +0000 (23:02 -0700)
committerJames Zern <jzern@google.com>
Wed, 20 Jul 2016 19:36:09 +0000 (12:36 -0700)
Change-Id: I9178ae75876f3df3fa3271314db39830552b9549

vp8/encoder/bitstream.c

index 6bd347887c8aff625db454f4afa816ae1f749920..d10b7cbe46058e0421e3d50499801f5dd647d44e 100644 (file)
@@ -1421,9 +1421,12 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest,
 #if CONFIG_MULTITHREAD
     if (cpi->b_multi_threaded) {
       pack_mb_row_tokens(cpi, &cpi->bc[1]);
-    } else
-#endif  // CONFIG_MULTITHREAD
+    } else {
       vp8_pack_tokens(&cpi->bc[1], cpi->tok, cpi->tok_count);
+    }
+#else
+    vp8_pack_tokens(&cpi->bc[1], cpi->tok, cpi->tok_count);
+#endif  // CONFIG_MULTITHREAD
 
     vp8_stop_encode(&cpi->bc[1]);