diff options
author | Lajos Molnar <lajos@google.com> | 2014-10-02 22:44:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-02 22:44:31 +0000 |
commit | 0ba908e7a55ce2641f8886db2a059ccaa3f7a22a (patch) | |
tree | 96933a04b8b3e0a7f2ff1dba62049975f6bd5d75 | |
parent | 36462d9de00105ae46ee3dbb0f644fa6af599f97 (diff) | |
parent | cd57b41db4b92ec04a1618c863060c821de12a5c (diff) | |
download | native-0ba908e7a55ce2641f8886db2a059ccaa3f7a22a.tar.gz |
Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
-rw-r--r-- | include/media/openmax/OMX_Video.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/openmax/OMX_Video.h b/include/media/openmax/OMX_Video.h index 21dc5a62cd..89425e01d9 100644 --- a/include/media/openmax/OMX_Video.h +++ b/include/media/openmax/OMX_Video.h @@ -818,6 +818,7 @@ typedef enum OMX_VIDEO_AVCLEVELTYPE { OMX_VIDEO_AVCLevel42 = 0x2000, /**< Level 4.2 */ OMX_VIDEO_AVCLevel5 = 0x4000, /**< Level 5 */ OMX_VIDEO_AVCLevel51 = 0x8000, /**< Level 5.1 */ + OMX_VIDEO_AVCLevel52 = 0x10000, /**< Level 5.2 */ OMX_VIDEO_AVCLevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_AVCLevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_AVCLevelMax = 0x7FFFFFFF |