summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-02-11 20:04:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-11 20:04:40 +0000
commit459c0b6d3693c6e7f29c538300cc78f64b8c318b (patch)
treecff16eaab6154ed36f59e69813aae554d3f015c6
parent34e32466466ad3f46697798c9f9644d62390c9b5 (diff)
parent9b6be8e10b25f6f0bb949fec67b36fc773f5b591 (diff)
downloadframeworks_native-459c0b6d3693c6e7f29c538300cc78f64b8c318b.zip
frameworks_native-459c0b6d3693c6e7f29c538300cc78f64b8c318b.tar.gz
frameworks_native-459c0b6d3693c6e7f29c538300cc78f64b8c318b.tar.bz2
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"
-rw-r--r--include/media/openmax/OMX_IVCommon.h1
1 files changed, 0 insertions, 1 deletions
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 @@ typedef enum OMX_COLOR_FORMATTYPE {
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,