sync to faad2 cvs, remove some warnings.

CVS patchset: 4592
CVS date: 2003/04/12 14:58:46

1 files changed, 22 insertions, 1 deletions

diff --git a/src/libfaad/structs.h b/src/libfaad/structs.h
index 5a6e58d0a..8a857dae3 100644
--- a/src/libfaad/structs.h
+++ b/src/libfaad/structs.h
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: structs.h,v 1.1 2002/12/16 19:02:00 miguelfreitas Exp $
+** $Id: structs.h,v 1.2 2003/04/12 14:58:47 miguelfreitas Exp $
 **/
 
 #ifndef __STRUCTS_H__
@@ -280,6 +280,26 @@ typedef struct
     ic_stream ics2;
 } element; /* syntax element (SCE, CPE, LFE) */
 
+typedef struct mp4AudioSpecificConfig
+{
+    /* Audio Specific Info */
+    uint8_t objectTypeIndex;
+    uint8_t samplingFrequencyIndex;
+    uint32_t samplingFrequency;
+    uint8_t channelsConfiguration;
+
+    /* GA Specific Info */
+    uint8_t frameLengthFlag;
+    uint8_t dependsOnCoreCoder;
+    uint16_t coreCoderDelay;
+    uint8_t extensionFlag;
+    uint8_t aacSectionDataResilienceFlag;
+    uint8_t aacScalefactorDataResilienceFlag;
+    uint8_t aacSpectralDataResilienceFlag;
+    uint8_t epConfig;
+
+} mp4AudioSpecificConfig;
+
 typedef struct faacDecConfiguration
 {
     uint8_t defObjectType;
@@ -293,6 +313,7 @@ typedef struct faacDecFrameInfo
     uint32_t samples;
     uint8_t channels;
     uint8_t error;
+    uint32_t samplerate;
 } faacDecFrameInfo;
 
 typedef struct