Merge "Patch to remove implicit segmentation." into experimental

[libvpx] / vp9 / encoder / vp9_bitstream.c

diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 7d250b346fbd4d067a31a1a5f394940d233c4540..a95d7eb4656d072fbc6c2a32c36a5cd52a606d0b 100644 (file)
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1364,9 +1364,6 @@ static void encode_segmentation(VP9_COMP *cpi, vp9_writer *w) {
 
   // Segmentation map
   vp9_write_bit(w, xd->update_mb_segmentation_map);
-#if CONFIG_IMPLICIT_SEGMENTATION
-  vp9_write_bit(w, xd->allow_implicit_segment_update);
-#endif
   if (xd->update_mb_segmentation_map) {
     // Select the coding strategy (temporal or spatial)
     vp9_choose_segmap_coding_method(cpi);