diff options
author | Pannag Sanketi <psanketi@google.com> | 2011-08-26 20:05:58 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-26 20:05:58 -0700 |
commit | 6004f2dc9af4088e34cc72b1ac3c4a3c5cd4ae14 (patch) | |
tree | a46bbb26c3283307ff30d7715b21b2d22e758693 | |
parent | f4b25b1dca4f1798c6f3f989be0738258d6504de (diff) | |
parent | 790332a3170f967d58cee5d89cc92be8205d9aa3 (diff) | |
download | frameworks_av-6004f2dc9af4088e34cc72b1ac3c4a3c5cd4ae14.zip frameworks_av-6004f2dc9af4088e34cc72b1ac3c4a3c5cd4ae14.tar.gz frameworks_av-6004f2dc9af4088e34cc72b1ac3c4a3c5cd4ae14.tar.bz2 |
Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
-rw-r--r-- | include/media/stagefright/openmax/OMX_IVCommon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/openmax/OMX_IVCommon.h b/include/media/stagefright/openmax/OMX_IVCommon.h index 65b6339..8bb4ded 100644 --- a/include/media/stagefright/openmax/OMX_IVCommon.h +++ b/include/media/stagefright/openmax/OMX_IVCommon.h @@ -156,7 +156,7 @@ typedef enum OMX_COLOR_FORMATTYPE { * Android-specific OMX IL colorformats. Change this enum to * an acceptable range once that is done. * */ - OMX_COLOR_FormatAndroidOpaque = 0x7F000001, + OMX_COLOR_FormatAndroidOpaque = 0x7F000789, OMX_TI_COLOR_FormatYUV420PackedSemiPlanar = 0x7F000100, OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00, OMX_COLOR_FormatMax = 0x7FFFFFFF |