diff options
| author | Lajos Molnar <lajos@google.com> | 2015-06-03 18:46:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-03 18:46:42 +0000 |
| commit | f2e61be9ac06b096713202497f08fa7245a97a74 (patch) | |
| tree | 808dbd836c220330f1cc4e1bd4fc3037d79596cb /include | |
| parent | d4a148b7d926a1784e7c4fe826645064c030962e (diff) | |
| parent | d910f3cf78ae878b1b86ead7ca837004c3a25aaa (diff) | |
| download | frameworks_native-f2e61be9ac06b096713202497f08fa7245a97a74.zip frameworks_native-f2e61be9ac06b096713202497f08fa7245a97a74.tar.gz frameworks_native-f2e61be9ac06b096713202497f08fa7245a97a74.tar.bz2 | |
am d910f3cf: media: rename VideoGrallocMetadata.hHandle to pHandle
* commit 'd910f3cf78ae878b1b86ead7ca837004c3a25aaa':
media: rename VideoGrallocMetadata.hHandle to pHandle
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/hardware/HardwareAPI.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/media/hardware/HardwareAPI.h b/include/media/hardware/HardwareAPI.h index a682ab7..5d2201b 100644 --- a/include/media/hardware/HardwareAPI.h +++ b/include/media/hardware/HardwareAPI.h @@ -100,14 +100,11 @@ struct StoreMetaDataInBuffersParams { // dynamic buffer handling. struct VideoGrallocMetadata { MetadataBufferType eType; // must be kMetadataBufferTypeGrallocSource - buffer_handle_t hHandle; + buffer_handle_t pHandle; }; // Legacy name for VideoGrallocMetadata struct. -struct VideoDecoderOutputMetaData { - MetadataBufferType eType; // must be kMetadataBufferTypeGrallocSource - buffer_handle_t pHandle; -}; +struct VideoDecoderOutputMetaData : public VideoGrallocMetadata {}; struct VideoNativeMetadata { MetadataBufferType eType; // must be kMetadataBufferTypeANWBuffer |