Merge "A bug fix related to switchable filters" into experimental

f09c4cde · Deb Mukherjee · Gerrit Code Review · d1244659 · 14a38a87 · f09c4cde
Commit f09c4cde authored Dec 10, 2012 by Deb Mukherjee Committed by Gerrit Code Review Dec 10, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vp9/encoder/vp9_encodeframe.c vp9/encoder/vp9_encodeframe.c +1 -1

No files found.
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -582,6 +582,7 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x,
        ++cpi->interintra_count[0];
      }
    }
+#endif
    if (cpi->common.mcomp_filter_type == SWITCHABLE &&
        mbmi->mode >= NEARESTMV &&
        mbmi->mode <= SPLITMV) {
@@ -589,7 +590,6 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x,
          [vp9_get_pred_context(&cpi->common, xd, PRED_SWITCHABLE_INTERP)]
          [vp9_switchable_interp_map[mbmi->interp_filter]];
    }
-#endif

    cpi->prediction_error += ctx->distortion;
    cpi->intra_error += ctx->intra_error;