summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-14 18:07:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-14 18:07:35 +0000
commit29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1 (patch)
tree815e0a3c1225770e29b6e72d7005737d1c9e398d /media/libmedia
parentb1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9 (diff)
parent9829344d526f87ca745208f04216ec795b239581 (diff)
downloadframeworks_av-29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1.zip
frameworks_av-29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1.tar.gz
frameworks_av-29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1.tar.bz2
am 9829344d: Merge "media: memset sizeof argument issues"
* commit '9829344d526f87ca745208f04216ec795b239581': media: memset sizeof argument issues
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/mediaplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 0f6d897..7a6f31d 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -654,7 +654,7 @@ status_t MediaPlayer::setRetransmitEndpoint(const char* addrString,
return BAD_VALUE;
}
- memset(&mRetransmitEndpoint, 0, sizeof(&mRetransmitEndpoint));
+ memset(&mRetransmitEndpoint, 0, sizeof(mRetransmitEndpoint));
mRetransmitEndpoint.sin_family = AF_INET;
mRetransmitEndpoint.sin_addr = saddr;
mRetransmitEndpoint.sin_port = htons(port);