diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-02-25 19:48:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-25 19:48:41 +0000 |
| commit | a63805cd676b7004f1851df6e43183f2a22c40a8 (patch) | |
| tree | 44422b33b0d733d0d7753342dd8afe3773cccc08 /media | |
| parent | b78d804b1090a430a126a6c356037ded96ffd91a (diff) | |
| parent | ed773ea8db3d4ea828f1220e234922a987fefb3b (diff) | |
| download | frameworks_av-a63805cd676b7004f1851df6e43183f2a22c40a8.zip frameworks_av-a63805cd676b7004f1851df6e43183f2a22c40a8.tar.gz frameworks_av-a63805cd676b7004f1851df6e43183f2a22c40a8.tar.bz2 | |
am ed773ea8: am 8fc4d57d: Merge "Avoid a building error"
* commit 'ed773ea8db3d4ea828f1220e234922a987fefb3b':
Avoid a building error
Diffstat (limited to 'media')
| -rw-r--r-- | media/libeffects/downmix/EffectDownmix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libeffects/downmix/EffectDownmix.c b/media/libeffects/downmix/EffectDownmix.c index 4ee05f2..d25dc9b 100644 --- a/media/libeffects/downmix/EffectDownmix.c +++ b/media/libeffects/downmix/EffectDownmix.c @@ -629,7 +629,9 @@ int Downmix_Configure(downmix_module_t *pDwmModule, effect_config_t *pConfig, bo return -EINVAL; } - memcpy(&pDwmModule->config, pConfig, sizeof(effect_config_t)); + if (&pDwmModule->config != pConfig) { + memcpy(&pDwmModule->config, pConfig, sizeof(effect_config_t)); + } if (init) { pDownmixer->type = DOWNMIX_TYPE_FOLD; |