ref: dd9dc0e9d65a985ba889e4e87926f23122eb7fa2
parent: eab6a421ea6c873342a8d8d5054180705fa1e097
 parent: 9e327dbb76540f128cde7367b85bca05aa5863e6
	author: John Koleszar <jkoleszar@google.com>
	date: Thu May  9 08:25:45 EDT 2013
	
Merge "Change test image format to VPX_IMG_FMT_I420" into experimental
--- a/test/i420_video_source.h
+++ b/test/i420_video_source.h
@@ -83,7 +83,7 @@
   void SetSize(unsigned int width, unsigned int height) {     if (width != width_ || height != height_) {vpx_img_free(img_);
- img_ = vpx_img_alloc(NULL, VPX_IMG_FMT_VPXI420, width, height, 1);
+ img_ = vpx_img_alloc(NULL, VPX_IMG_FMT_I420, width, height, 1);
ASSERT_TRUE(img_ != NULL);
width_ = width;
height_ = height;
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -103,7 +103,7 @@
     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_VPXI420, width, height, 32);
+ img_ = vpx_img_alloc(NULL, VPX_IMG_FMT_I420, width, height, 32);
width_ = width;
height_ = height;
}
--
⑨