summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-02-24 10:32:34 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-24 10:32:34 -0800
commit70450553f8f1e6ec4967f86a4b811db2940e8772 (patch)
tree77cf1bc76ff1024c513cae6087920a7c2adddc6a
parent78fc0c0bfae913a4a44011225396ae525b335fb1 (diff)
parent14c6e2728c2ae39aab6fc9a9a77c402d7322afc0 (diff)
am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '14c6e2728c2ae39aab6fc9a9a77c402d7322afc0': stagefright aacenc: Fix an inline asm constraint
-rw-r--r--media/libstagefright/codecs/aacenc/basic_op/oper_32b.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.h b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.h
index 9ebd1c29d774..6e5844faad34 100644
--- a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.h
+++ b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.h
@@ -63,7 +63,7 @@ __inline Word32 L_mpy_wx(Word32 L_var2, Word16 var1)
Word32 result;
asm volatile(
"SMULWB %[result], %[L_var2], %[var1] \n"
- :[result]"+r"(result)
+ :[result]"=r"(result)
:[L_var2]"r"(L_var2), [var1]"r"(var1)
);
return result;