diff options
author | Thom Johansen <thomj@rockbox.org> | 2005-11-02 19:23:27 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2005-11-02 19:23:27 +0000 |
commit | 36612151349302d637ee22131761a60df9f7a2f7 (patch) | |
tree | 7d89f24e2ef73468d01c890d8b30b0420a55e5a1 /apps | |
parent | a8b9fd1cf896ecaa826227ae19e39ec9007102b3 (diff) | |
download | rockbox-36612151349302d637ee22131761a60df9f7a2f7.tar.gz rockbox-36612151349302d637ee22131761a60df9f7a2f7.zip |
Better place for EMAC init.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7733 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/libfaad/decoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/libfaad/decoder.c b/apps/codecs/libfaad/decoder.c index a86b6dde8b..10d97952bd 100644 --- a/apps/codecs/libfaad/decoder.c +++ b/apps/codecs/libfaad/decoder.c | |||
@@ -95,6 +95,10 @@ NeAACDecHandle NEAACDECAPI NeAACDecOpen(void) | |||
95 | uint8_t i; | 95 | uint8_t i; |
96 | NeAACDecHandle hDecoder = NULL; | 96 | NeAACDecHandle hDecoder = NULL; |
97 | 97 | ||
98 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | ||
99 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); | ||
100 | #endif | ||
101 | |||
98 | if ((hDecoder = (NeAACDecHandle)faad_malloc(sizeof(NeAACDecStruct))) == NULL) | 102 | if ((hDecoder = (NeAACDecHandle)faad_malloc(sizeof(NeAACDecStruct))) == NULL) |
99 | return NULL; | 103 | return NULL; |
100 | 104 | ||
@@ -318,10 +322,6 @@ int8_t NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, uint8_t *pBuffer, | |||
318 | hDecoder->adif_header_present = 0; | 322 | hDecoder->adif_header_present = 0; |
319 | hDecoder->adts_header_present = 0; | 323 | hDecoder->adts_header_present = 0; |
320 | 324 | ||
321 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | ||
322 | coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); | ||
323 | #endif | ||
324 | |||
325 | /* decode the audio specific config */ | 325 | /* decode the audio specific config */ |
326 | rc = AudioSpecificConfig2(pBuffer, SizeOfDecoderSpecificInfo, &mp4ASC, | 326 | rc = AudioSpecificConfig2(pBuffer, SizeOfDecoderSpecificInfo, &mp4ASC, |
327 | &(hDecoder->pce)); | 327 | &(hDecoder->pce)); |