diff --git a/ChangeLog b/ChangeLog index 1cc834f..be909a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +2.8.6: 2.8.5: - another package fix 2.8.4: diff --git a/configure b/configure index 00c16cd..5ee6770 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for faad2 2.8.5. +# Generated by GNU Autoconf 2.69 for faad2 2.8.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='faad2' PACKAGE_TARNAME='faad2' -PACKAGE_VERSION='2.8.5' -PACKAGE_STRING='faad2 2.8.5' +PACKAGE_VERSION='2.8.6' +PACKAGE_STRING='faad2 2.8.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1344,7 +1344,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures faad2 2.8.5 to adapt to many kinds of systems. +\`configure' configures faad2 2.8.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1415,7 +1415,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of faad2 2.8.5:";; + short | recursive ) echo "Configuration of faad2 2.8.6:";; esac cat <<\_ACEOF @@ -1531,7 +1531,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -faad2 configure 2.8.5 +faad2 configure 2.8.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2071,7 +2071,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by faad2 $as_me 2.8.5, which was +It was created by faad2 $as_me 2.8.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2934,7 +2934,7 @@ # Define the identity of the package. PACKAGE='faad2' - VERSION='2.8.5' + VERSION='2.8.6' cat >>confdefs.h <<_ACEOF @@ -18296,7 +18296,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by faad2 $as_me 2.8.5, which was +This file was extended by faad2 $as_me 2.8.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18362,7 +18362,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -faad2 config.status 2.8.5 +faad2 config.status 2.8.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5e7f316..cd2933a 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed) AC_PREREQ(2.50) -AC_INIT(faad2, 2.8.5) +AC_INIT(faad2, 2.8.6) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/faad2.spec b/faad2.spec index 1fb9e82..ae2d45a 100644 --- a/faad2.spec +++ b/faad2.spec @@ -24,7 +24,7 @@ Summary: C library and frontend for decoding MPEG2/4 AAC Name: faad2 -Version: 2.8.5 +Version: 2.8.6 Release: 1 License: GPL Group: Applications/Multimedia diff --git a/frontend/mp4read.c b/frontend/mp4read.c index c5d11b1..9d92bf5 100644 --- a/frontend/mp4read.c +++ b/frontend/mp4read.c @@ -178,7 +178,7 @@ if (memcmp("soun", buf, 4)) { if (mp4config.verbose.header) - fprintf(stderr, "unsuported, skipping\n"); + fprintf(stderr, "unsupported, skipping\n"); return ERR_UNSUPPORTED; } else diff --git a/include/neaacdec.h b/include/neaacdec.h index 3e10bff..15bbbb9 100644 --- a/include/neaacdec.h +++ b/include/neaacdec.h @@ -60,17 +60,11 @@ #ifdef _WIN32 #pragma pack(push, 8) - #ifndef NEAACDECAPI - #define NEAACDECAPI __cdecl - #endif + #define NEAACDECAPI __declspec(dllexport) #elif defined(__GNUC__) && __GNUC__ >= 4 - #ifndef NEAACDECAPI - #define NEAACDECAPI __attribute__((visibility("default"))) - #endif + #define NEAACDECAPI __attribute__((visibility("default"))) #else - #ifndef NEAACDECAPI - #define NEAACDECAPI - #endif + #define NEAACDECAPI #endif #define FAAD2_VERSION "unknown" @@ -202,57 +196,57 @@ unsigned char ps; } NeAACDecFrameInfo; -char NEAACDECAPI *NeAACDecGetErrorMessage(unsigned char errcode); - -unsigned long NEAACDECAPI NeAACDecGetCapabilities(void); - -NeAACDecHandle NEAACDECAPI NeAACDecOpen(void); - -NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder); - -unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder, +NEAACDECAPI char* NeAACDecGetErrorMessage(unsigned char errcode); + +NEAACDECAPI unsigned long NeAACDecGetCapabilities(void); + +NEAACDECAPI NeAACDecHandle NeAACDecOpen(void); + +NEAACDECAPI NeAACDecConfigurationPtr NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder); + +NEAACDECAPI unsigned char NeAACDecSetConfiguration(NeAACDecHandle hDecoder, NeAACDecConfigurationPtr config); /* Init the library based on info from the AAC file (ADTS/ADIF) */ -long NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder, +NEAACDECAPI long NeAACDecInit(NeAACDecHandle hDecoder, unsigned char *buffer, unsigned long buffer_size, unsigned long *samplerate, unsigned char *channels); /* Init the library using a DecoderSpecificInfo */ -char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, +NEAACDECAPI char NeAACDecInit2(NeAACDecHandle hDecoder, unsigned char *pBuffer, unsigned long SizeOfDecoderSpecificInfo, unsigned long *samplerate, unsigned char *channels); /* Init the library for DRM */ -char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hDecoder, unsigned long samplerate, +NEAACDECAPI char NeAACDecInitDRM(NeAACDecHandle *hDecoder, unsigned long samplerate, unsigned char channels); -void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame); - -void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder); - -void NEAACDECAPI *NeAACDecDecode(NeAACDecHandle hDecoder, +NEAACDECAPI void NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame); + +NEAACDECAPI void NeAACDecClose(NeAACDecHandle hDecoder); + +NEAACDECAPI void* NeAACDecDecode(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, unsigned char *buffer, unsigned long buffer_size); -void NEAACDECAPI *NeAACDecDecode2(NeAACDecHandle hDecoder, +NEAACDECAPI void* NeAACDecDecode2(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, unsigned char *buffer, unsigned long buffer_size, void **sample_buffer, unsigned long sample_buffer_size); -char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer, +NEAACDECAPI char NeAACDecAudioSpecificConfig(unsigned char *pBuffer, unsigned long buffer_size, mp4AudioSpecificConfig *mp4ASC); /* Get version and copyright strings */ -int NEAACDECAPI NeAACDecGetVersion(char **faad_id_string, +NEAACDECAPI int NeAACDecGetVersion(char **faad_id_string, char **faad_copyright_string); #ifdef _WIN32 diff --git a/libfaad/decoder.c b/libfaad/decoder.c index 08fc1e9..44762f6 100644 --- a/libfaad/decoder.c +++ b/libfaad/decoder.c @@ -64,7 +64,7 @@ NeAACDecFrameInfo *hInfo); -int NEAACDECAPI NeAACDecGetVersion(char **faad_id_string, +int NeAACDecGetVersion(char **faad_id_string, char **faad_copyright_string) { static char *libfaadName = PACKAGE_VERSION; @@ -81,14 +81,15 @@ return 0; } -char NEAACDECAPI *NeAACDecGetErrorMessage(unsigned char errcode) + +char* NeAACDecGetErrorMessage(unsigned char errcode) { if (errcode >= NUM_ERROR_MESSAGES) return NULL; return err_msg[errcode]; } -unsigned long NEAACDECAPI NeAACDecGetCapabilities(void) +unsigned long NeAACDecGetCapabilities(void) { uint32_t cap = 0; @@ -115,7 +116,7 @@ } const unsigned char mes[] = { 0x67,0x20,0x61,0x20,0x20,0x20,0x6f,0x20,0x72,0x20,0x65,0x20,0x6e,0x20,0x20,0x20,0x74,0x20,0x68,0x20,0x67,0x20,0x69,0x20,0x72,0x20,0x79,0x20,0x70,0x20,0x6f,0x20,0x63 }; -NeAACDecHandle NEAACDECAPI NeAACDecOpen(void) +NeAACDecHandle NeAACDecOpen(void) { uint8_t i; NeAACDecStruct *hDecoder = NULL; @@ -176,7 +177,7 @@ return hDecoder; } -NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hpDecoder) +NeAACDecConfigurationPtr NeAACDecGetCurrentConfiguration(NeAACDecHandle hpDecoder) { NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder; if (hDecoder) @@ -189,7 +190,7 @@ return NULL; } -unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hpDecoder, +unsigned char NeAACDecSetConfiguration(NeAACDecHandle hpDecoder, NeAACDecConfigurationPtr config) { NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder; @@ -252,7 +253,7 @@ } -long NEAACDECAPI NeAACDecInit(NeAACDecHandle hpDecoder, +long NeAACDecInit(NeAACDecHandle hpDecoder, unsigned char *buffer, unsigned long buffer_size, unsigned long *samplerate, @@ -386,7 +387,7 @@ } /* Init the library using a DecoderSpecificInfo */ -char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hpDecoder, +char NeAACDecInit2(NeAACDecHandle hpDecoder, unsigned char *pBuffer, unsigned long SizeOfDecoderSpecificInfo, unsigned long *samplerate, @@ -480,7 +481,7 @@ } #ifdef DRM -char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hpDecoder, +char NeAACDecInitDRM(NeAACDecHandle *hpDecoder, unsigned long samplerate, unsigned char channels) { @@ -523,7 +524,7 @@ } #endif -void NEAACDECAPI NeAACDecClose(NeAACDecHandle hpDecoder) +void NeAACDecClose(NeAACDecHandle hpDecoder) { uint8_t i; NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder; @@ -577,7 +578,7 @@ if (hDecoder) faad_free(hDecoder); } -void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hpDecoder, long frame) +void NeAACDecPostSeekReset(NeAACDecHandle hpDecoder, long frame) { NeAACDecStruct* hDecoder = (NeAACDecStruct*)hpDecoder; if (hDecoder) @@ -807,7 +808,7 @@ } } -void NEAACDECAPI *NeAACDecDecode(NeAACDecHandle hpDecoder, +void* NeAACDecDecode(NeAACDecHandle hpDecoder, NeAACDecFrameInfo *hInfo, unsigned char *buffer, unsigned long buffer_size) @@ -816,7 +817,7 @@ return aac_frame_decode(hDecoder, hInfo, buffer, buffer_size, NULL, 0); } -void NEAACDECAPI *NeAACDecDecode2(NeAACDecHandle hpDecoder, +void* NeAACDecDecode2(NeAACDecHandle hpDecoder, NeAACDecFrameInfo *hInfo, unsigned char *buffer, unsigned long buffer_size, diff --git a/libfaad/mp4.c b/libfaad/mp4.c index 65bfb15..9f0198a 100644 --- a/libfaad/mp4.c +++ b/libfaad/mp4.c @@ -114,7 +114,7 @@ }; /* Table 1.6.1 */ -char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer, +char NeAACDecAudioSpecificConfig(unsigned char *pBuffer, unsigned long buffer_size, mp4AudioSpecificConfig *mp4ASC) {