commit 8fc4d57d41f532b90187b9404a8ac705770d75b4
author Glenn Kasten <gkasten@android.com> Tue Feb 25 19:36:22 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 25 19:36:23 2014 +0000
tree 6fa63a63d790ed9a8401f60d5473c21ae2f9fc52
parent 4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae
parent a93c8c9c89ba679cf312c7d082913121bb5543c2

Merge "Avoid a building error"

media/libeffects/downmix/EffectDownmix.c

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 @@
         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;