libvpx: Pull from upstream

source/libvpx/test/encode_test_driver.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.
  */
 #include "vpx_config.h"
@@ skipping 142 matching lines @@
       again = video->img() != NULL;
 
       PreEncodeFrameHook(video);
       PreEncodeFrameHook(video, &encoder);
       encoder.EncodeFrame(video, frame_flags_);
 
       CxDataIterator iter = encoder.GetCxData();
 
       while (const vpx_codec_cx_pkt_t *pkt = iter.Next()) {
         again = true;
-
+#if CONFIG_VP8_DECODER
+        vpx_codec_err_t res_dec;
+#endif
         switch (pkt->kind) {
           case VPX_CODEC_CX_FRAME_PKT:
 #if CONFIG_VP8_DECODER
             has_cxdata = true;
-            decoder.DecodeFrame((const uint8_t*)pkt->data.frame.buf,
-                                pkt->data.frame.sz);
+            res_dec = decoder.DecodeFrame((const uint8_t*)pkt->data.frame.buf,
+                                          pkt->data.frame.sz);
+            ASSERT_EQ(VPX_CODEC_OK, res_dec) << decoder.DecodeError();
 #endif
             ASSERT_GE(pkt->data.frame.pts, last_pts_);
             last_pts_ = pkt->data.frame.pts;
             FramePktHook(pkt);
             break;
 
           case VPX_CODEC_PSNR_PKT:
             PSNRPktHook(pkt);
             break;
 
@@ skipping 17 matching lines @@
         break;
     }
 
     EndPassHook();
 
     if (!Continue())
       break;
   }
 }
 }  // namespace libvpx_test