commit 3990c542246b5070bc9e8ced146ccf5e5fa87b8f
author Vignesh Venkatasubramanian <vigneshv@google.com> Thu Jan 21 02:36:13 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 21 02:36:13 2016 +0000
tree 1cbff133af12de72596d24ea68206f0daec117e4
parent 899823966e78552bb6dfd7772403a4f91471d2b0
parent 8ac1a9f6d00193ab38feefed25cd4bcdbd7f045e

Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev

media/libstagefright/codecs/on2/dec/SoftVPX.cpp

diff --git a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp
index 09e8789..4cf3d4f 100644
--- a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp
+++ b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp
@@ -133,7 +133,7 @@
         }
 
         if (mImg != NULL) {
-            CHECK_EQ(mImg->fmt, IMG_FMT_I420);
+            CHECK_EQ(mImg->fmt, VPX_IMG_FMT_I420);
 
             uint32_t width = mImg->d_w;
             uint32_t height = mImg->d_h;
@@ -149,12 +149,12 @@
             outHeader->nTimeStamp = inHeader->nTimeStamp;
 
             uint8_t *dst = outHeader->pBuffer;
-            const uint8_t *srcY = (const uint8_t *)mImg->planes[PLANE_Y];
-            const uint8_t *srcU = (const uint8_t *)mImg->planes[PLANE_U];
-            const uint8_t *srcV = (const uint8_t *)mImg->planes[PLANE_V];
-            size_t srcYStride = mImg->stride[PLANE_Y];
-            size_t srcUStride = mImg->stride[PLANE_U];
-            size_t srcVStride = mImg->stride[PLANE_V];
+            const uint8_t *srcY = (const uint8_t *)mImg->planes[VPX_PLANE_Y];
+            const uint8_t *srcU = (const uint8_t *)mImg->planes[VPX_PLANE_U];
+            const uint8_t *srcV = (const uint8_t *)mImg->planes[VPX_PLANE_V];
+            size_t srcYStride = mImg->stride[VPX_PLANE_Y];
+            size_t srcUStride = mImg->stride[VPX_PLANE_U];
+            size_t srcVStride = mImg->stride[VPX_PLANE_V];
             copyYV12FrameToOutputBuffer(dst, srcY, srcU, srcV, srcYStride, srcUStride, srcVStride);
 
             mImg = NULL;