libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_debugmodes.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 69 matching lines @@
     for (b_row = 0; b_row < 4 * rows; b_row++) {
       int b_col;
       int bindex;
 
       for (b_col = 0; b_col < 4 * cols; b_col++) {
         mb_index = (b_row >> 2) * (cols + 1) + (b_col >> 2);
         bindex = (b_row & 3) * 4 + (b_col & 3);
 
         if (mi[mb_index].mbmi.mode == B_PRED) {
           fprintf(mvs, "%2d ", mi[mb_index].bmi[bindex].as_mode.first);
-#if CONFIG_COMP_INTRA_PRED
-          fprintf(mvs, "%2d ", mi[mb_index].bmi[bindex].as_mode.second);
-#endif
         } else
           fprintf(mvs, "xx ");
 
       }
 
       fprintf(mvs, "\n");
     }
   }
   fprintf(mvs, "\n");
 
@@ skipping 34 matching lines @@
 
       }
 
       fprintf(mvs, "\n");
     }
   }
   fprintf(mvs, "\n");
 
   fclose(mvs);
 }