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/rtsp | |
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/rtsp')
-rw-r--r-- | media/libstagefright/rtsp/AMPEG2TSAssembler.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/rtsp/ARTPWriter.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/rtsp/ARawAudioAssembler.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/media/libstagefright/rtsp/AMPEG2TSAssembler.cpp b/media/libstagefright/rtsp/AMPEG2TSAssembler.cpp index 4c9bf5b..dca5c89 100644 --- a/media/libstagefright/rtsp/AMPEG2TSAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG2TSAssembler.cpp @@ -34,7 +34,9 @@ namespace android { AMPEG2TSAssembler::AMPEG2TSAssembler( - const sp<AMessage> ¬ify, const char *desc, const AString ¶ms) + const sp<AMessage> ¬ify, + const char * /* desc */, + const AString & /* params */) : mNotifyMsg(notify), mNextExpectedSeqNoValid(false), mNextExpectedSeqNo(0) { diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp index 0d07043..c46d16f 100644 --- a/media/libstagefright/rtsp/ARTPWriter.cpp +++ b/media/libstagefright/rtsp/ARTPWriter.cpp @@ -114,7 +114,7 @@ bool ARTPWriter::reachedEOS() { return (mFlags & kFlagEOS) != 0; } -status_t ARTPWriter::start(MetaData *params) { +status_t ARTPWriter::start(MetaData * /* params */) { Mutex::Autolock autoLock(mLock); if (mFlags & kFlagStarted) { return INVALID_OPERATION; diff --git a/media/libstagefright/rtsp/ARawAudioAssembler.cpp b/media/libstagefright/rtsp/ARawAudioAssembler.cpp index 0da5dd2..167f7a4 100644 --- a/media/libstagefright/rtsp/ARawAudioAssembler.cpp +++ b/media/libstagefright/rtsp/ARawAudioAssembler.cpp @@ -34,7 +34,9 @@ namespace android { ARawAudioAssembler::ARawAudioAssembler( - const sp<AMessage> ¬ify, const char *desc, const AString ¶ms) + const sp<AMessage> ¬ify, + const char * /* desc */, + const AString & /* params */) : mNotifyMsg(notify), mNextExpectedSeqNoValid(false), mNextExpectedSeqNo(0) { |