diff --git a/include/media/hardware/HardwareAPI.h b/include/media/hardware/HardwareAPI.h
index a682ab77f..5d2201b0f 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