diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-11 17:12:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 17:12:06 +0000 |
| commit | c2dc9646b7c8aa4a55901edba04f45c99a9ed662 (patch) | |
| tree | d4a6104bb0496c1f86b54e922a89ee07cca98236 | |
| parent | b120f897ad41c0a386081f74f47fd560c6e86f34 (diff) | |
| parent | 8fc4d57d41f532b90187b9404a8ac705770d75b4 (diff) | |
| download | frameworks_av-c2dc9646b7c8aa4a55901edba04f45c99a9ed662.zip frameworks_av-c2dc9646b7c8aa4a55901edba04f45c99a9ed662.tar.gz frameworks_av-c2dc9646b7c8aa4a55901edba04f45c99a9ed662.tar.bz2 | |
am 8fc4d57d: Merge "Avoid a building error"
* commit '8fc4d57d41f532b90187b9404a8ac705770d75b4':
Avoid a building error
| -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; |