am bf82692: am faf38b2: am 9e3d957: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"

Jean-Baptiste Queru · Android Git Automerger · commit 19bb62613f51 · 2012-02-27T13:12:42.000-08:00
* commit 'bf8269238be1c5bde9f82a986fb128d9a80f250b':
  stagefright aacenc: Add prototypes for arm specific implementations of functions
diff --git 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
 
 

Original file line number	Diff line number	Diff line change
`@@ -339,6 +339,12 @@ static void PostMDCT(int buf0, int num, const int csptr)`
`339`	`339`	`*buf1-- = MULHIGH(cosb, tr2) + MULHIGH(sinb, ti2);`
`340`	`340`	`}`
`341`	`341`	`}`
	`342`	`+#else`
	`343`	`+void Radix4First(int *buf, int num);`
	`344`	`+void Radix8First(int *buf, int num);`
	`345`	`+void Radix4FFT(int buf, int num, int bgn, int twidTab);`
	`346`	`+void PreMDCT(int buf0, int num, const int csptr);`
	`347`	`+void PostMDCT(int buf0, int num, const int csptr);`
`342`	`348`	`#endif`
`343`	`349`
`344`	`350`