commit a33d7b225e39e3304e211d747f8ba2456879a03e
author The Android Automerger <android-build@google.com> Mon Feb 09 06:10:17 2015 -0800
committer The Android Automerger <android-build@google.com> Mon Feb 09 06:10:17 2015 -0800
tree 07027eb0d6391678d54f3b0fe08cfa46f3c2cdd6
parent d25be0ea48c775e4038163b546c9553e294d4fdc
parent 02d3387d7948c5ecd362c5ead6607b6f4ac02668

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

include/media/openmax/OMX_IVCommon.h

diff --git a/include/media/openmax/OMX_IVCommon.h b/include/media/openmax/OMX_IVCommon.h
index a5b9d18..cbf0564 100644
--- a/include/media/openmax/OMX_IVCommon.h
+++ b/include/media/openmax/OMX_IVCommon.h
@@ -165,6 +165,7 @@
     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,