Mercurial > audlegacy-plugins
diff src/aac/libfaad2/structs.h @ 1188:22a470857579 trunk
- fix the bug that aac plugin had failed to get proper playtime length on AMD64.
- fix typedef conflict. uint32_t isn't unsigned long on 64bit machines.
- resolve all warnings.
- unnecessary code has been removed.
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Mon, 18 Jun 2007 21:53:26 +0900 |
parents | e6c5fdae6e88 |
children | f1b6f1b2cdb3 |
line wrap: on
line diff
--- a/src/aac/libfaad2/structs.h Mon Jun 18 15:15:32 2007 +0900 +++ b/src/aac/libfaad2/structs.h Mon Jun 18 21:53:26 2007 +0900 @@ -312,7 +312,7 @@ /* Audio Specific Info */ /*uint8_t*/ unsigned char objectTypeIndex; /*uint8_t*/ unsigned char samplingFrequencyIndex; - /*uint32_t*/ unsigned long samplingFrequency; + /*uint32_t*/ unsigned int samplingFrequency; /*uint8_t*/ unsigned char channelsConfiguration; /* GA Specific Info */ @@ -333,7 +333,7 @@ typedef struct NeAACDecConfiguration { /*uint8_t*/ unsigned char defObjectType; - /*uint32_t*/ unsigned long defSampleRate; + /*uint32_t*/ unsigned int defSampleRate; /*uint8_t*/ unsigned char outputFormat; /*uint8_t*/ unsigned char downMatrix; /*uint8_t*/ unsigned char useOldADTSFormat; @@ -342,11 +342,11 @@ typedef struct NeAACDecFrameInfo { - /*uint32_t*/ unsigned long bytesconsumed; + /*uint32_t*/ unsigned int bytesconsumed; /*uint32_t*/ unsigned long samples; /*uint8_t*/ unsigned char channels; /*uint8_t*/ unsigned char error; - /*uint32_t*/ unsigned long samplerate; + /*uint32_t*/ unsigned int samplerate; /* SBR: 0: off, 1: on; normal, 2: on; downsampled */ /*uint8_t*/ unsigned char sbr;