libvpx: Pull from upstream

source/libvpx/test/y4m_test.cc

 /*
  *  Copyright (c) 2012 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 39 matching lines @@
     "b239c6b301c0b835485be349ca83a7e3"},
   {"park_joy_90p_12_444.y4m", 12, VPX_IMG_FMT_I44416,
     "5a6481a550821dab6d0192f5c63845e9"},
 };
 
 static void write_image_file(const vpx_image_t *img, FILE *file) {
   int plane, y;
   for (plane = 0; plane < 3; ++plane) {
     const unsigned char *buf = img->planes[plane];
     const int stride = img->stride[plane];
-    const int bytes_per_sample = (img->fmt & VPX_IMG_FMT_HIGH) ? 2 : 1;
+    const int bytes_per_sample = (img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? 2 : 1;
     const int h = (plane ? (img->d_h + img->y_chroma_shift) >>
                    img->y_chroma_shift : img->d_h);
     const int w = (plane ? (img->d_w + img->x_chroma_shift) >>
                    img->x_chroma_shift : img->d_w);
     for (y = 0; y < h; ++y) {
       fwrite(buf, bytes_per_sample, w, file);
       buf += stride;
     }
   }
 }
@@ skipping 113 matching lines @@
 TEST_P(Y4mVideoWriteTest, WriteTest) {
   const Y4mTestParam t = GetParam();
   Init(t.filename, kFrames);
   HeaderChecks(t.bit_depth, t.format);
   Md5Check(t.md5raw);
 }
 
 INSTANTIATE_TEST_CASE_P(C, Y4mVideoWriteTest,
                         ::testing::ValuesIn(kY4mTestVectors));
 }  // namespace