libvpx: Pull from upstream

source/libvpx/test/video_source.h

 /*
  *  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.
  */
 #ifndef TEST_VIDEO_SOURCE_H_
@@ skipping 157 matching lines @@
 
   virtual unsigned int limit() const { return limit_; }
 
   void set_limit(unsigned int limit) {
     limit_ = limit;
   }
 
   void SetSize(unsigned int width, unsigned int height) {
     if (width != width_ || height != height_) {
       vpx_img_free(img_);
-      raw_sz_ = ((width + 31)&~31) * height * 3 / 2;
       img_ = vpx_img_alloc(NULL, VPX_IMG_FMT_I420, width, height, 32);
+      raw_sz_ = ((img_->w + 31) & ~31) * img_->h * 3 / 2;
       width_ = width;
       height_ = height;
     }
   }
 
  protected:
   virtual void FillFrame() { if (img_) memset(img_->img_data, 0, raw_sz_); }
 
   vpx_image_t *img_;
   size_t       raw_sz_;
@@ skipping 51 matching lines @@
   virtual const uint8_t *cxdata() const = 0;
 
   virtual size_t frame_size() const = 0;
 
   virtual unsigned int frame_number() const = 0;
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_VIDEO_SOURCE_H_