diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-27 02:41:41 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-07-27 02:41:41 -0700 |
| commit | b008e9b1281da871e970e5b4817f78afb4f12d4a (patch) | |
| tree | d1d6f8338d470406fcfb868303aafe85dad64971 /media/jni | |
| parent | 84aa5066855daaa944d8e0f5846bbff05ed1c748 (diff) | |
| parent | d306cc8192bf569b2e6e7d58b4d73f6607e9d509 (diff) | |
| download | frameworks_base-b008e9b1281da871e970e5b4817f78afb4f12d4a.zip frameworks_base-b008e9b1281da871e970e5b4817f78afb4f12d4a.tar.gz frameworks_base-b008e9b1281da871e970e5b4817f78afb4f12d4a.tar.bz2 | |
resolved conflicts for merge of d306cc81 to master
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index beb3dfc..e3b9e36 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -549,7 +549,7 @@ static jint android_media_AudioEffect_native_setParameter(JNIEnv *env, p = (effect_param_t *) malloc(sizeof(effect_param_t) + voffset + vsize); memcpy(p->data, lpParam, psize); p->psize = psize; - memcpy(p->data + voffset, lpValue, psize); + memcpy(p->data + voffset, lpValue, vsize); p->vsize = vsize; lStatus = lpAudioEffect->setParameter(p); |