shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -582,6 +582,7 @@

         ++cpi->interintra_count[0];

       }

     }

+#endif

     if (cpi->common.mcomp_filter_type == SWITCHABLE &&

         mbmi->mode >= NEARESTMV &&

         mbmi->mode <= SPLITMV) {

@@ -589,7 +590,6 @@

           [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;