diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-05-31 02:56:20 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-31 02:56:20 -0700 |
| commit | aaf61dfbcab414bfacc3171501be17d191ff8506 (patch) | |
| tree | 55d21504fdd3ea63cc633cfc329f40aaaf1a33d5 /vp9/encoder/vp9_bitstream.c | |
| parent | 7ca651a38391a3e8ec42f8de56fe7264dc3a6d2f (diff) | |
| parent | 1b103f250f36f6b20d245f717faa477649f9fec7 (diff) | |
| download | libvpx-aaf61dfbcab414bfacc3171501be17d191ff8506.tar libvpx-aaf61dfbcab414bfacc3171501be17d191ff8506.tar.gz libvpx-aaf61dfbcab414bfacc3171501be17d191ff8506.tar.bz2 libvpx-aaf61dfbcab414bfacc3171501be17d191ff8506.zip | |
Merge "Patch to remove implicit segmentation." into experimental
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 7d250b346..a95d7eb46 100644 --- 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); |