commit bb3e2fcfb05adfbacbf71fbff4e06800d624eb55
author Dan Stoza <stoza@google.com> Thu Jan 28 23:11:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 28 23:11:58 2016 +0000
tree a3a3c309adb1db3243f5e14494fea13683c0ce07
parent 7c8053cf7fe281db34d7494433a5a3231afa3b24
parent 6d51c0c1f279d1e2db4f0b1067efb01070b4d8fb

Merge "Add cast to make room for naming pixel_format_t"
am: 6d51c0c1f2

* commit '6d51c0c1f279d1e2db4f0b1067efb01070b4d8fb':
  Add cast to make room for naming pixel_format_t

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 0b81b80..fad06b8 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -3840,7 +3840,7 @@
         fmt != OMX_COLOR_FormatYUV420PackedPlanar &&
         fmt != OMX_COLOR_FormatYUV420SemiPlanar &&
         fmt != OMX_COLOR_FormatYUV420PackedSemiPlanar &&
-        fmt != HAL_PIXEL_FORMAT_YV12) {
+        fmt != (OMX_COLOR_FORMATTYPE)HAL_PIXEL_FORMAT_YV12) {
         ALOGW("do not know color format 0x%x = %d", fmt, fmt);
         return false;
     }