summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-02-27 13:10:10 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-27 13:10:10 -0800
commitbf8269238be1c5bde9f82a986fb128d9a80f250b (patch)
tree63a0c144b93bd86586c84292340d7dd9ff41076c
parentb7913f709b443df8d55ac2f6e080ab0ae38bcadf (diff)
parentfaf38b24c0255ea7492277b0aa03a401dbdbb2b8 (diff)
am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit 'faf38b24c0255ea7492277b0aa03a401dbdbb2b8': 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