Freeware Advanced Audio Coder

Update of /cvsroot/faac/faad2/libfaad
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31374/libfaad

Modified Files:
	Makefile.am common.h decoder.c mp4.h 
Log Message:
Final fixes to version numbers and use of external header

Index: Makefile.am
===================================================================
RCS file: /cvsroot/faac/faad2/libfaad/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** Makefile.am	26 Jan 2009 23:51:15 -0000	1.32
--- Makefile.am	5 Feb 2009 00:51:03 -0000	1.33
***************
*** 5,9 ****
  		  $(top_srcdir)/include/neaacdec.h
  
! libfaad_la_LDFLAGS = -version-info 1:0:0
  libfaad_la_LIBADD = -lm
  
--- 5,9 ----
  		  $(top_srcdir)/include/neaacdec.h
  
! libfaad_la_LDFLAGS = -version-info 2:0:0
  libfaad_la_LIBADD = -lm
  

Index: common.h
===================================================================
RCS file: /cvsroot/faac/faad2/libfaad/common.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** common.h	26 Jan 2009 23:51:15 -0000	1.76
--- common.h	5 Feb 2009 00:51:03 -0000	1.77
***************
*** 40,44 ****
  #endif
  
! #include <neaacdec.h>
  
  #if 1
--- 40,44 ----
  #endif
  
! #include "neaacdec.h"
  
  #if 1

Index: decoder.c
===================================================================
RCS file: /cvsroot/faac/faad2/libfaad/decoder.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -r1.116 -r1.117
*** decoder.c	26 Jan 2009 23:51:15 -0000	1.116
--- decoder.c	5 Feb 2009 00:51:03 -0000	1.117
***************
*** 160,165 ****
  }
  
! NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecStruct *hDecoder)
  {
      if (hDecoder)
      {
--- 160,166 ----
  }
  
! NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hpDecoder)
  {
+     NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder;
      if (hDecoder)
      {
***************
*** 172,178 ****
  }
  
! unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecStruct *hDecoder,
                                                     NeAACDecConfigurationPtr config)
  {
      if (hDecoder && config)
      {
--- 173,180 ----
  }
  
! unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hpDecoder,
                                                     NeAACDecConfigurationPtr config)
  {
+     NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder;
      if (hDecoder && config)
      {
***************
*** 234,238 ****
  
  
! long NEAACDECAPI NeAACDecInit(NeAACDecStruct *hDecoder,
                                unsigned char *buffer,
                                unsigned long buffer_size,
--- 236,240 ----
  
  
! long NEAACDECAPI NeAACDecInit(NeAACDecHandle hpDecoder,
                                unsigned char *buffer,
                                unsigned long buffer_size,
***************
*** 244,247 ****
--- 246,250 ----
      adif_header adif;
      adts_header adts;
+     NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder;
  
  
***************
*** 364,368 ****
  
  /* Init the library using a DecoderSpecificInfo */
! char NEAACDECAPI NeAACDecInit2(NeAACDecStruct *hDecoder,
                                 unsigned char *pBuffer,
                                 unsigned long SizeOfDecoderSpecificInfo,
--- 367,371 ----
  
  /* Init the library using a DecoderSpecificInfo */
! char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hpDecoder,
                                 unsigned char *pBuffer,
                                 unsigned long SizeOfDecoderSpecificInfo,
***************
*** 370,373 ****
--- 373,377 ----
                                 unsigned char *channels)
  {
+     NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder;
      int8_t rc;
      mp4AudioSpecificConfig mp4ASC;
***************
*** 457,464 ****
  
  #ifdef DRM
! char NEAACDECAPI NeAACDecInitDRM(NeAACDecStruct **hDecoder,
                                   unsigned long samplerate,
                                   unsigned char channels)
  {
      if (hDecoder == NULL)
          return 1; /* error */
--- 461,469 ----
  
  #ifdef DRM
! char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hpDecoder,
                                   unsigned long samplerate,
                                   unsigned char channels)
  {
+     NeAACDecStruct** hDecoder = (NeAACDecStruct**)hpDecoder;
      if (hDecoder == NULL)
          return 1; /* error */
***************
*** 499,505 ****
  #endif
  
! void NEAACDECAPI NeAACDecClose(NeAACDecStruct *hDecoder)
  {
      uint8_t i;
  
      if (hDecoder == NULL)
--- 504,511 ----
  #endif
  
! void NEAACDECAPI NeAACDecClose(NeAACDecHandle hpDecoder)
  {
      uint8_t i;
+     NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder;
  
      if (hDecoder == NULL)
***************
*** 552,557 ****
  }
  
! void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecStruct *hDecoder, long frame)
  {
      if (hDecoder)
      {
--- 558,564 ----
  }
  
! void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hpDecoder, long frame)
  {
+     NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder;
      if (hDecoder)
      {
***************
*** 781,793 ****
  }
  
! void* NEAACDECAPI NeAACDecDecode(NeAACDecStruct *hDecoder,
                                   NeAACDecFrameInfo *hInfo,
                                   unsigned char *buffer,
                                   unsigned long buffer_size)
  {
      return aac_frame_decode(hDecoder, hInfo, buffer, buffer_size, NULL, 0);
  }
  
! void* NEAACDECAPI NeAACDecDecode2(NeAACDecStruct *hDecoder,
                                    NeAACDecFrameInfo *hInfo,
                                    unsigned char *buffer,
--- 788,801 ----
  }
  
! void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hpDecoder,
                                   NeAACDecFrameInfo *hInfo,
                                   unsigned char *buffer,
                                   unsigned long buffer_size)
  {
+     NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder;
      return aac_frame_decode(hDecoder, hInfo, buffer, buffer_size, NULL, 0);
  }
  
! void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hpDecoder,
                                    NeAACDecFrameInfo *hInfo,
                                    unsigned char *buffer,
***************
*** 796,799 ****
--- 804,808 ----
                                    unsigned long sample_buffer_size)
  {
+     NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder;
      if ((sample_buffer == NULL) || (sample_buffer_size == 0))
      {

Index: mp4.h
===================================================================
RCS file: /cvsroot/faac/faad2/libfaad/mp4.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** mp4.h	26 Jan 2009 23:51:15 -0000	1.27
--- mp4.h	5 Feb 2009 00:51:03 -0000	1.28
***************
*** 36,40 ****
  #endif
  
! #include <neaacdec.h>
  
  int8_t AudioSpecificConfig2(uint8_t *pBuffer,
--- 36,40 ----
  #endif
  
! #include "neaacdec.h"
  
  int8_t AudioSpecificConfig2(uint8_t *pBuffer,