diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-13 11:19:14 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-06-13 11:19:14 +0100 |
| commit | 8b8e5d45928aed8592d321fe55f560e35a4fece8 (patch) | |
| tree | 4b3f3a52af3086587e3ac3cb741698b005c64fb1 /include | |
| parent | 2a8270e6944fb3addfcba87f6885aaad196b8b88 (diff) | |
| parent | cbd74fcbd2528e3cdb699ac26e8ed579085dd49a (diff) | |
| download | frameworks_av-8b8e5d45928aed8592d321fe55f560e35a4fece8.zip frameworks_av-8b8e5d45928aed8592d321fe55f560e35a4fece8.tar.gz frameworks_av-8b8e5d45928aed8592d321fe55f560e35a4fece8.tar.bz2 | |
resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp
Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 6643736..b74a2c7 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -38,8 +38,8 @@ class IOMX : public IInterface { public: DECLARE_META_INTERFACE(OMX); - typedef void *buffer_id; - typedef void *node_id; + typedef uint32_t buffer_id; + typedef uint32_t node_id; // Given a node_id and the calling process' pid, returns true iff // the implementation of the OMX interface lives in the same diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 76aa503..1f17efe 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -182,7 +182,7 @@ private: }; struct BufferInfo { - void *mBufferID; + uint32_t mBufferID; sp<ABuffer> mData; sp<ABuffer> mEncryptedData; sp<AMessage> mNotify; |