am 167013b2: am 0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev

* commit '167013b2bea340ccf14bf751ef39cc5abef4533a':
  add OMX_VIDEO_AVCLevel52 constant
This commit is contained in:
Lajos Molnar 2014-10-02 23:06:25 +00:00 committed by Android Git Automerger
commit 754b3c9fe1
1 changed files with 1 additions and 0 deletions

View File

@ -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