summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-11-17 13:06:38 -0800
committerJessica Wagantall <jwagantall@cyngn.com>2016-11-17 13:26:08 -0800
commitb7b6162d97f199943c20baf88ae8256531c9f128 (patch)
tree090ed79dc49e2da4f65b45b77bee431c2177bbc8
parent195d411d057336ee3363f16f391c826a05196d36 (diff)
downloadframeworks_av-stable/cm-12.1-YOG4P.tar.gz
frameworks_av-stable/cm-12.1-YOG4P.tar.bz2
frameworks_av-stable/cm-12.1-YOG4P.zip
OMXNodeInstance: Move definition of mBufferIDCount for LP64 targetsstable/cm-12.1-YOG4P
Moved first due to security patches: 1474154d41f5935b20d5042731980de09825d1ee CYNGNOS-3303 Change-Id: Icb274672957e4bcfe40d65e253ba6fad12603c4f
-rw-r--r--media/libstagefright/include/OMXNodeInstance.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/include/OMXNodeInstance.h b/media/libstagefright/include/OMXNodeInstance.h
index aa5e98490a..bfc8fa762f 100644
--- a/media/libstagefright/include/OMXNodeInstance.h
+++ b/media/libstagefright/include/OMXNodeInstance.h
@@ -151,9 +151,10 @@ private:
OMX::buffer_id mID;
};
Vector<ActiveBuffer> mActiveBuffers;
+
+ uint32_t mBufferIDCount;
#ifdef __LP64__
Mutex mBufferIDLock;
- uint32_t mBufferIDCount;
KeyedVector<OMX::buffer_id, OMX_BUFFERHEADERTYPE *> mBufferIDToBufferHeader;
KeyedVector<OMX_BUFFERHEADERTYPE *, OMX::buffer_id> mBufferHeaderToBufferID;
#endif