commit 459c0b6d3693c6e7f29c538300cc78f64b8c318b
author Lajos Molnar <lajos@google.com> Wed Feb 11 20:04:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 11 20:04:40 2015 +0000
tree cff16eaab6154ed36f59e69813aae554d3f015c6
parent 34e32466466ad3f46697798c9f9644d62390c9b5
parent 9b6be8e10b25f6f0bb949fec67b36fc773f5b591

am 9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices"

* commit '9b6be8e10b25f6f0bb949fec67b36fc773f5b591':
  Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"

include/media/openmax/OMX_IVCommon.h

diff --git a/include/media/openmax/OMX_IVCommon.h b/include/media/openmax/OMX_IVCommon.h
index cbf0564..a5b9d18 100644
--- a/include/media/openmax/OMX_IVCommon.h
+++ b/include/media/openmax/OMX_IVCommon.h
@@ -165,7 +165,6 @@
     OMX_COLOR_FormatYUV420Flexible = 0x7F420888,
 
     OMX_TI_COLOR_FormatYUV420PackedSemiPlanar = 0x7F000100,
-    OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar = 0x7FA00E00,
     OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00,
     OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka = 0x7FA30C03,
     OMX_SEC_COLOR_FormatNV12Tiled = 0x7FC00002,