diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-02 23:06:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 23:06:25 +0000 |
| commit | 754b3c9fe1c6008d42e4be15dbe574cfbc275779 (patch) | |
| tree | c6d75f66e0798cfe40a4abaadf6d7d48064f3234 /include | |
| parent | 36a4d17104f8a8d4523071d829ac43c8507ced64 (diff) | |
| parent | 167013b2bea340ccf14bf751ef39cc5abef4533a (diff) | |
| download | frameworks_native-754b3c9fe1c6008d42e4be15dbe574cfbc275779.zip frameworks_native-754b3c9fe1c6008d42e4be15dbe574cfbc275779.tar.gz frameworks_native-754b3c9fe1c6008d42e4be15dbe574cfbc275779.tar.bz2 | |
am 167013b2: am 0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '167013b2bea340ccf14bf751ef39cc5abef4533a':
add OMX_VIDEO_AVCLevel52 constant
Diffstat (limited to 'include')
| -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 21dc5a6..89425e0 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 |