summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx/OMX.cpp
diff options
context:
space:
mode:
authorKévin PETIT <kevin.petit@arm.com>2014-02-03 12:35:36 +0000
committerNarayan Kamath <narayan@google.com>2014-02-11 11:40:06 +0000
commit377b2ec9a2885f9b6405b07ba900a9e3f4349c38 (patch)
treeb938e1d75a1beefae86244f287ca22f4a277740d /media/libstagefright/omx/OMX.cpp
parentcdda7bf4d3ca9cad6979374a18dd5be79ea83d80 (diff)
downloadframeworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.zip
frameworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.tar.gz
frameworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.tar.bz2
Make frameworks/av 64-bit compatible
Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
Diffstat (limited to 'media/libstagefright/omx/OMX.cpp')
-rw-r--r--media/libstagefright/omx/OMX.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index 84a0e10..274f2eb 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -479,7 +479,7 @@ OMX_ERRORTYPE OMX::OnFillBufferDone(
OMX::node_id OMX::makeNodeID(OMXNodeInstance *instance) {
// mLock is already held.
- node_id node = (node_id)++mNodeCounter;
+ node_id node = (node_id)(uintptr_t)++mNodeCounter;
mNodeIDToInstance.add(node, instance);
return node;