summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2016-09-28 23:15:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-28 23:15:17 +0000
commitc85c2316fff9a90dd23d975c820ae9dd6ecf8111 (patch)
treea24e0bbc6428c0c89bae3ecfdecf8e9b74cbe8b0 /include/media
parent00dfc466657b25bdc2e4e063bc41097e7a3f8fa0 (diff)
parent14664fb503fe8855279b62d6c2442d189d87dd7f (diff)
downloadnative-c85c2316fff9a90dd23d975c820ae9dd6ecf8111.tar.gz
Merge "Fix google-explicit-constructor warnings in HardwareAPI." am: c8de4a06ab am: 9285335221 am: 64e47fabae
am: 14664fb503 Change-Id: Ifa5345bfaef9b1fc03491b7dc249ecd8ce191247
Diffstat (limited to 'include/media')
-rw-r--r--include/media/hardware/HardwareAPI.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/hardware/HardwareAPI.h b/include/media/hardware/HardwareAPI.h
index 2c50ad6f15..cecf7152f4 100644
--- a/include/media/hardware/HardwareAPI.h
+++ b/include/media/hardware/HardwareAPI.h
@@ -270,7 +270,7 @@ struct DescribeColorFormatParams {
// output: fill out the MediaImage fields
MediaImage sMediaImage;
- DescribeColorFormatParams(const DescribeColorFormat2Params&); // for internal use only
+ explicit DescribeColorFormatParams(const DescribeColorFormat2Params&); // for internal use only
};
// A pointer to this struct is passed to OMX_GetParameter when the extension