summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
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/libstagefright
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/libstagefright')
-rw-r--r--media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
index 9a5828d..89f0fed 100644
--- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
+++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
@@ -217,7 +217,7 @@ OMX_ERRORTYPE SoftAVCEncoder::initEncParams() {
mHandle->CBAVC_Free = FreeWrapper;
CHECK(mEncParams != NULL);
- memset(mEncParams, 0, sizeof(mEncParams));
+ memset(mEncParams, 0, sizeof(*mEncParams));
mEncParams->rate_control = AVC_ON;
mEncParams->initQP = 0;
mEncParams->init_CBP_removal_delay = 1600;