commit 8d755de2864f7d22a8bd356a07403e82449e862d
author The Android Automerger <android-build@google.com> Sun Feb 15 18:36:19 2015 -0800
committer The Android Automerger <android-build@google.com> Sun Feb 15 18:36:19 2015 -0800
tree d2f2b10f80b1ae99ca70ffc33d46e6f89f78c16e
parent e2c8023444bf96739ff0e4cbaebc086bb73d3bf0
parent f626b839e2478b9f34337d851cc84c3773224d24

merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev

media/libstagefright/colorconversion/SoftwareRenderer.cpp

diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index a78465e..4e75250 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -101,10 +101,9 @@
     int halFormat;
     size_t bufWidth, bufHeight;
 
-    switch ((int)mColorFormat) {
+    switch (mColorFormat) {
         case OMX_COLOR_FormatYUV420Planar:
         case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
-        case OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar:
         case OMX_COLOR_FormatYUV420SemiPlanar:
         {
             if (!runningInEmulator()) {
@@ -239,7 +238,6 @@
             dst_v += dst_c_stride;
         }
     } else if (mColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar
-            || mColorFormat == OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
             || mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) {
         const uint8_t *src_y =
             (const uint8_t *)data;