diff options
| author | Andreas Huber <andih@google.com> | 2014-04-11 07:54:53 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 17:12:03 +0000 |
| commit | d411b4ca2945cd8974a3a78199fce94646950128 (patch) | |
| tree | e1c9e21525348fe826b91ecee7075ccb743f843d /media/libstagefright/omx/OMX.cpp | |
| parent | 51b3ea2b8f7298bffbd246c65a606cd053357b66 (diff) | |
| download | frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.zip frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.tar.gz frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.tar.bz2 | |
warnings be gone.
(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.
Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
Diffstat (limited to 'media/libstagefright/omx/OMX.cpp')
| -rw-r--r-- | media/libstagefright/omx/OMX.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index 274f2eb..a608479 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -185,7 +185,7 @@ void OMX::binderDied(const wp<IBinder> &the_late_who) { instance->onObserverDied(mMaster); } -bool OMX::livesLocally(node_id node, pid_t pid) { +bool OMX::livesLocally(node_id /* node */, pid_t pid) { return pid == getpid(); } @@ -424,7 +424,7 @@ OMX_ERRORTYPE OMX::OnEvent( OMX_IN OMX_EVENTTYPE eEvent, OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2, - OMX_IN OMX_PTR pEventData) { + OMX_IN OMX_PTR /* pEventData */) { ALOGV("OnEvent(%d, %ld, %ld)", eEvent, nData1, nData2); // Forward to OMXNodeInstance. |