diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-02-25 19:36:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-25 19:36:23 +0000 |
| commit | 8fc4d57d41f532b90187b9404a8ac705770d75b4 (patch) | |
| tree | 6fa63a63d790ed9a8401f60d5473c21ae2f9fc52 /media | |
| parent | 4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae (diff) | |
| parent | a93c8c9c89ba679cf312c7d082913121bb5543c2 (diff) | |
| download | frameworks_av-8fc4d57d41f532b90187b9404a8ac705770d75b4.zip frameworks_av-8fc4d57d41f532b90187b9404a8ac705770d75b4.tar.gz frameworks_av-8fc4d57d41f532b90187b9404a8ac705770d75b4.tar.bz2 | |
Merge "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; |