diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 12:42:07 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 14:14:19 -0700 |
| commit | e8240462ae10187cebe6993125ca6e3a7b03dd91 (patch) | |
| tree | 481c78b62b8799021efc8003a08ea4445ebc4fbb /mm-core | |
| parent | e736937ab609fd727ca7fb5586f74e0df931a4f9 (diff) | |
| parent | 89913d7df36dbeb458ce165856bd6505a2ec647d (diff) | |
| download | android_hardware_qcom_media-e8240462ae10187cebe6993125ca6e3a7b03dd91.tar.gz android_hardware_qcom_media-e8240462ae10187cebe6993125ca6e3a7b03dd91.tar.bz2 android_hardware_qcom_media-e8240462ae10187cebe6993125ca6e3a7b03dd91.zip | |
Merge tag 'android-6.0.1_r46' into HEAD
Android 6.0.1 release 46
Change-Id: Ia92a2f00e7f6008854ccedb23c7b0cd6a65e080f
Diffstat (limited to 'mm-core')
| -rw-r--r-- | mm-core/inc/OMX_QCOMExtns.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h index f0e1593c..eb1b990b 100644 --- a/mm-core/inc/OMX_QCOMExtns.h +++ b/mm-core/inc/OMX_QCOMExtns.h @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2009-2015, The Linux Foundation. All rights reserved. +Copyright (c) 2009-2016, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1348,6 +1348,8 @@ typedef struct QOMX_VIDEO_QUERY_DECODER_INSTANCES { } QOMX_VIDEO_QUERY_DECODER_INSTANCES; typedef struct QOMX_ENABLETYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; OMX_BOOL bEnable; } QOMX_ENABLETYPE; @@ -1451,6 +1453,8 @@ typedef enum QOMX_VIDEO_PICTURETYPE { typedef struct QOMX_RECTTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; OMX_S32 nLeft; OMX_S32 nTop; OMX_U32 nWidth; @@ -1551,7 +1555,6 @@ typedef struct QOMX_VIDEO_HIERARCHICALLAYERS { QOMX_VIDEO_HIERARCHICALCODINGTYPE eHierarchicalCodingType; } QOMX_VIDEO_HIERARCHICALLAYERS; - #ifdef __cplusplus } #endif /* __cplusplus */ |