shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "VP9: handle_inter_mode()... Use interp_filter"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -2465,9 +2465,9 @@

   if (pred_filter_search) {

     INTERP_FILTER af = SWITCHABLE, lf = SWITCHABLE;

-    if (xd->above_mi)

+    if (xd->above_mi && is_inter_block(xd->above_mi))

       af = xd->above_mi->interp_filter;

-    if (xd->left_mi)

+    if (xd->left_mi && is_inter_block(xd->left_mi))

       lf = xd->left_mi->interp_filter;

     if ((this_mode != NEWMV) || (af == lf))