commit 1b0a5245a6dd1e86e56e3cecb8bbf0b9ec985f27
author Lajos Molnar <lajos@google.com> Fri Feb 06 20:14:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 06 20:14:55 2015 +0000
tree 67b7f6d4b975951b81e18439d751cc1cd751eaa5
parent ea5da67d90647a1d4b395be51bf9cec218b98b71
parent d25be0ea48c775e4038163b546c9553e294d4fdc

am d25be0ea: (-s ours) DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar

* commit 'd25be0ea48c775e4038163b546c9553e294d4fdc':
  DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar

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,