summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-02-27 13:07:43 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-27 13:07:43 -0800
commitfaf38b24c0255ea7492277b0aa03a401dbdbb2b8 (patch)
treee5cd0fe6a0e22e36207243980b02fded0758313a
parent163777b8be102a10f6e4a4a6c5be90eed2a479d2 (diff)
parent9e3d957599c76ba19e23fd25b75ccc02d54efe3e (diff)
am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e': stagefright aacenc: Add prototypes for arm specific implementations of functions
-rw-r--r--media/libstagefright/codecs/aacenc/src/transform.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/transform.c b/media/libstagefright/codecs/aacenc/src/transform.c
index a154a2f9b0b0..a02336f3f030 100644
--- a/media/libstagefright/codecs/aacenc/src/transform.c
+++ b/media/libstagefright/codecs/aacenc/src/transform.c
@@ -339,6 +339,12 @@ static void PostMDCT(int *buf0, int num, const int *csptr)
*buf1-- = MULHIGH(cosb, tr2) + MULHIGH(sinb, ti2);
}
}
+#else
+void Radix4First(int *buf, int num);
+void Radix8First(int *buf, int num);
+void Radix4FFT(int *buf, int num, int bgn, int *twidTab);
+void PreMDCT(int *buf0, int num, const int *csptr);
+void PostMDCT(int *buf0, int num, const int *csptr);
#endif