[SCM] faad2/master: Remove all patches that were either applied, solved differently or disapproved upstream
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Mon May 11 09:57:21 UTC 2015
The following commit has been merged in the master branch:
commit 48834293a868d2267af974fc06d4edef93c54260
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date: Mon May 11 11:56:17 2015 +0200
Remove all patches that were either applied, solved differently or disapproved upstream
diff --git a/debian/patches/autotools-compat.patch b/debian/patches/autotools-compat.patch
deleted file mode 100644
index dbcdfe3..0000000
--- a/debian/patches/autotools-compat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Fix most autotools warnings
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,8 @@ SUBDIRS = libfaad common frontend plugin
-
- EXTRA_DIST = faad2.spec
-
-+ACLOCAL_AMFLAGS = -I m4
-+
- rpm: Makefile
- make dist
- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
---- a/configure.in
-+++ b/configure.in
-@@ -7,9 +7,10 @@ dnl - faad
- dnl - xmms input mp4/aac plugin
- dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed)
-
--AC_INIT
-+AC_INIT([faad2], [2.7.0])
- AC_CONFIG_AUX_DIR(.)
--AM_INIT_AUTOMAKE(faad2, 2.7.0)
-+AM_INIT_AUTOMAKE([subdir-objects])
-+AC_CONFIG_MACRO_DIR([m4])
-
- AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
---- a/frontend/Makefile.am
-+++ b/frontend/Makefile.am
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = faad
- man_MANS = faad.man
-
--INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
-+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
- -I$(top_srcdir)/common/mp4ff
-
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
---- a/plugins/mpeg4ip/Makefile.am
-+++ b/plugins/mpeg4ip/Makefile.am
-@@ -13,7 +13,7 @@ faad2_plugin_la_LIBADD = \
- -lm
-
-
--INCLUDES = -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-
- AM_CFLAGS = -D_REENTRANT -fexceptions
-
diff --git a/debian/patches/bpa-stdin.patch b/debian/patches/bpa-stdin.patch
deleted file mode 100644
index d8a4bd2..0000000
--- a/debian/patches/bpa-stdin.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-Description: The patch enables input on stdin for AAC/AAC+ streams.
-Origin: http://www.freebsd.org/cgi/cvsweb.cgi/ports/audio/faad/files/patch-frontend_main.c
-Bug: http://bugs.slimdevices.com/show_bug.cgi?id=10602
-Forwarded: menno at audiocoding.com
-Author: Bryan Alton
-Reviewed-By: Mark Knight <http://www.freebsd.org/cgi/query-pr.cgi?pr=138213>
-Bug-Ubuntu: https://launchpad.net/bugs/470562
-
-$FreeBSD: ports/audio/faad/files/patch-frontend_main.c,v 1.3 2010/02/25 17:12:54 brooks Exp $
-
---- faad2.orig/frontend/main.c
-+++ faad2/frontend/main.c
-@@ -137,6 +137,31 @@ static void advance_buffer(aac_buffer *b
- b->bytes_into_buffer = 0;
- }
-
-+static void lookforheader(aac_buffer *b)
-+{
-+ int i = 0;
-+ while (!b->at_eof )
-+ {
-+ if (b->bytes_into_buffer > 4)
-+ {
-+ if( ((b->buffer[0+i] == 0xff) && ((b->buffer[1+i] & 0xf6) == 0xf0)) ||
-+ (b->buffer[0+i] == 'A' && b->buffer[1+i] == 'D' && b->buffer[2+i] == 'I' && b->buffer[3+i] == 'F'))
-+ {
-+ fill_buffer(b);
-+ break;
-+ } else {
-+ i++;
-+ b->file_offset += 1;
-+ b->bytes_consumed += 1;
-+ b->bytes_into_buffer -= 1;
-+ }
-+ } else {
-+ fill_buffer(b);
-+ i = 0;
-+ }
-+ }
-+}
-+
- static int adts_sample_rates[] = {96000,88200,64000,48000,44100,32000,24000,22050,16000,12000,11025,8000,7350,0,0,0};
-
- static int adts_parse(aac_buffer *b, int *bitrate, float *length)
-@@ -424,6 +449,8 @@ static int decodeAACfile(char *aacfile,
- float length = 0;
-
- int first_time = 1;
-+ int retval;
-+ int streaminput = 0;
-
- aac_buffer b;
-
-@@ -439,17 +466,39 @@ static int decodeAACfile(char *aacfile,
- }
- }
-
-- b.infile = fopen(aacfile, "rb");
-- if (b.infile == NULL)
-+ if (0 == strcmp(aacfile, "-"))
- {
-- /* unable to open file */
-- faad_fprintf(stderr, "Error opening file: %s\n", aacfile);
-- return 1;
-+ b.infile = stdin;
-+#ifdef _WIN32
-+ setmode(fileno(stdin), O_BINARY);
-+#endif
-+
-+ } else
-+ {
-+ b.infile = fopen(aacfile, "rb");
-+ if (b.infile == NULL)
-+ {
-+ /* unable to open file */
-+ faad_fprintf(stderr, "Error opening file: %s\n", aacfile);
-+ return 1;
-+ }
- }
-
-- fseek(b.infile, 0, SEEK_END);
-- fileread = ftell(b.infile);
-- fseek(b.infile, 0, SEEK_SET);
-+ retval = fseek(b.infile, 0, SEEK_END);
-+#ifdef _WIN32
-+ if (0 == strcmp(aacfile, "-")) {
-+ retval = -1;
-+ }
-+#endif
-+ if (retval )
-+ {
-+ faad_fprintf(stderr, "Input not seekable %s\n", aacfile);
-+ fileread = -1;
-+ streaminput = 1;
-+ } else {
-+ fileread = ftell(b.infile);
-+ fseek(b.infile, 0, SEEK_SET);
-+ };
-
- if (!(b.buffer = (unsigned char*)malloc(FAAD_MIN_STREAMSIZE*MAX_CHANNELS)))
- {
-@@ -494,19 +543,39 @@ static int decodeAACfile(char *aacfile,
-
- /* get AAC infos for printing */
- header_type = 0;
-+ if (streaminput == 1 )
-+ lookforheader(&b);
-+
- if ((b.buffer[0] == 0xFF) && ((b.buffer[1] & 0xF6) == 0xF0))
- {
-- adts_parse(&b, &bitrate, &length);
-- fseek(b.infile, tagsize, SEEK_SET);
--
-- bread = fread(b.buffer, 1, FAAD_MIN_STREAMSIZE*MAX_CHANNELS, b.infile);
-- if (bread != FAAD_MIN_STREAMSIZE*MAX_CHANNELS)
-- b.at_eof = 1;
-- else
-- b.at_eof = 0;
-- b.bytes_into_buffer = bread;
-- b.bytes_consumed = 0;
-- b.file_offset = tagsize;
-+ if (streaminput ==1)
-+ {
-+ int frames, frame_length;
-+ int samplerate;
-+ float frames_per_sec, bytes_per_frame;
-+ samplerate = adts_sample_rates[(b.buffer[2]&0x3c)>>2];
-+ frame_length = ((((unsigned int)b.buffer[3] & 0x3)) << 11)
-+ | (((unsigned int)b.buffer[4]) << 3) | (b.buffer[5] >> 5);
-+
-+ frames_per_sec = (float)samplerate/1024.0f;
-+ bytes_per_frame = (float)frame_length/(float)(1000);
-+ bitrate = (int)(8. * bytes_per_frame * frames_per_sec + 0.5);
-+ length = 1;
-+ faad_fprintf(stderr, "Streamed input format samplerate %d channels %d.\n",samplerate,channels);
-+
-+ } else {
-+ adts_parse(&b, &bitrate, &length);
-+ fseek(b.infile, tagsize, SEEK_SET);
-+
-+ bread = fread(b.buffer, 1, FAAD_MIN_STREAMSIZE*MAX_CHANNELS, b.infile);
-+ if (bread != FAAD_MIN_STREAMSIZE*MAX_CHANNELS)
-+ b.at_eof = 1;
-+ else
-+ b.at_eof = 0;
-+ b.bytes_into_buffer = bread;
-+ b.bytes_consumed = 0;
-+ b.file_offset = tagsize;
-+ }
-
- header_type = 1;
- } else if (memcmp(b.buffer, "ADIF", 4) == 0) {
-@@ -538,7 +607,8 @@ static int decodeAACfile(char *aacfile,
- if (b.buffer)
- free(b.buffer);
- NeAACDecClose(hDecoder);
-- fclose(b.infile);
-+ if (b.infile != stdin)
-+ fclose(b.infile);
- return 1;
- }
- advance_buffer(&b, bread);
-@@ -564,7 +634,8 @@ static int decodeAACfile(char *aacfile,
- if (infoOnly)
- {
- NeAACDecClose(hDecoder);
-- fclose(b.infile);
-+ if (b.infile != stdin)
-+ fclose(b.infile);
- if (b.buffer)
- free(b.buffer);
- return 0;
-@@ -621,7 +692,8 @@ static int decodeAACfile(char *aacfile,
- if (b.buffer)
- free(b.buffer);
- NeAACDecClose(hDecoder);
-- fclose(b.infile);
-+ if (b.infile != stdin)
-+ fclose(b.infile);
- return 0;
- }
- } else {
-@@ -662,7 +734,8 @@ static int decodeAACfile(char *aacfile,
- fclose(adtsFile);
- }
-
-- fclose(b.infile);
-+ if (b.infile != stdin)
-+ fclose(b.infile);
-
- if (!first_time && !adts_out)
- close_audio_file(aufile);
-@@ -750,6 +823,11 @@ static int decodeMP4file(char *mp4file,
- /* initialise the callback structure */
- mp4ff_callback_t *mp4cb = malloc(sizeof(mp4ff_callback_t));
-
-+ if (strcmp(mp4file, "-") == 0 ) {
-+ faad_fprintf(stderr, "Cannot open stdin for MP4 input \n");
-+ return 1;
-+ }
-+
- mp4File = fopen(mp4file, "rb");
- mp4cb->read = read_callback;
- mp4cb->seek = seek_callback;
-@@ -1016,6 +1094,7 @@ int main(int argc, char *argv[])
- int result;
- int infoOnly = 0;
- int writeToStdio = 0;
-+ int readFromStdin = 0;
- int object_type = LC;
- int def_srate = 0;
- int downMatrix = 0;
-@@ -1229,15 +1308,30 @@ int main(int argc, char *argv[])
- }
-
- /* check for mp4 file */
-- mp4file = 0;
-- hMP4File = fopen(aacFileName, "rb");
-- if (!hMP4File)
-- {
-- faad_fprintf(stderr, "Error opening file: %s\n", aacFileName);
-- return 1;
-+ if (0 == strcmp(aacFileName, "-")) {
-+ faad_fprintf(stderr, "Reading from stdin: %s\n", aacFileName);
-+ readFromStdin = 1;
-+ hMP4File = stdin;
-+#ifdef _WIN32
-+ setmode(fileno(stdin), O_BINARY);
-+#endif
-+
-+ } else {
-+
-+ mp4file = 0;
-+ hMP4File = fopen(aacFileName, "rb");
-+ if (!hMP4File)
-+ {
-+ faad_fprintf(stderr, "Error opening file: %s\n", aacFileName);
-+ return 1;
-+ }
- }
-+
- fread(header, 1, 8, hMP4File);
-- fclose(hMP4File);
-+
-+ if (! readFromStdin )
-+ fclose(hMP4File);
-+
- if (header[4] == 'f' && header[5] == 't' && header[6] == 'y' && header[7] == 'p')
- mp4file = 1;
-
-@@ -1246,6 +1340,18 @@ int main(int argc, char *argv[])
- result = decodeMP4file(aacFileName, audioFileName, adtsFileName, writeToStdio,
- outputFormat, format, downMatrix, noGapless, infoOnly, adts_out, &length);
- } else {
-+
-+ if (readFromStdin == 1) {
-+ ungetc(header[7],hMP4File);
-+ ungetc(header[6],hMP4File);
-+ ungetc(header[5],hMP4File);
-+ ungetc(header[4],hMP4File);
-+ ungetc(header[3],hMP4File);
-+ ungetc(header[2],hMP4File);
-+ ungetc(header[1],hMP4File);
-+ ungetc(header[0],hMP4File);
-+ }
-+
- result = decodeAACfile(aacFileName, audioFileName, adtsFileName, writeToStdio,
- def_srate, object_type, outputFormat, format, downMatrix, infoOnly, adts_out,
- old_format, &length);
diff --git a/debian/patches/fix_ftbfs_with_gcc4.5.patch b/debian/patches/fix_ftbfs_with_gcc4.5.patch
deleted file mode 100644
index 15ecd5d..0000000
--- a/debian/patches/fix_ftbfs_with_gcc4.5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Correctly declare lrintf in libfaad/common.h to avoid
- a conflict of declaration in mathcalls.h to fix FTBFS on i386.
-Origin: Ubuntu
-Author: Bhavani Shankar <bhavi at ubuntu.com>
-
-Index: faad2-2.7/libfaad/common.h
-=====================================
---- faad2-2.7.orig/libfaad/common.h
-+++ faad2-2.7/libfaad/common.h
-@@ -330,7 +330,7 @@
- #ifndef HAVE_LRINTF
- #define HAS_LRINTF
- // from http://www.stereopsis.com/FPU.html
-- static INLINE int lrintf(float f)
-+ static INLINE int _lrintf(float f)
- {
- int i;
- __asm__ __volatile__ (
-@@ -396,7 +396,7 @@
-
- #ifndef HAS_LRINTF
- /* standard cast */
--#define lrintf(f) ((int32_t)(f))
-+#define _lrintf(f) ((int32_t)(f))
- #endif
-
- typedef real_t complex_t[2];
diff --git a/debian/patches/incorrect_pointer_size.patch b/debian/patches/incorrect_pointer_size.patch
deleted file mode 100644
index a8d25c1..0000000
--- a/debian/patches/incorrect_pointer_size.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: faad segfaults on amd64 due to incorrect pointer size
- When running faad with a command line similar to:
- alessio at alessio-laptop:~$ faad -b 2 -f 2 -w sample.aac
- a SIGSEGV gets raised. This issue is due to an incorrect pointer size
- used in the write_audio{32,64}bit functions.
-Origin: Ubuntu
-Bug: https://sourceforge.net/support/tracker.php?aid=3110758
-Bug-Debian: http://bugs.debian.org/603807
-Bug-Ubuntu: https://launchpad.net/bugs/665802
-Reviewed-by: Alessio Treglia <alessio at debian.org>
-Last-Update: 2010-11-17
----
- frontend/audio.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/frontend/audio.c
-+++ b/frontend/audio.c
-@@ -347,7 +347,7 @@
- {
- int ret;
- unsigned int i;
-- long *sample_buffer24 = (long*)sample_buffer;
-+ int *sample_buffer24 = (int*)sample_buffer;
- char *data = malloc(samples*aufile->bits_per_sample*sizeof(char)/8);
-
- aufile->total_samples += samples;
-@@ -391,7 +391,7 @@
- {
- int ret;
- unsigned int i;
-- long *sample_buffer32 = (long*)sample_buffer;
-+ int *sample_buffer32 = (int*)sample_buffer;
- char *data = malloc(samples*aufile->bits_per_sample*sizeof(char)/8);
-
- aufile->total_samples += samples;
diff --git a/debian/patches/libfaad-drm.patch b/debian/patches/libfaad-drm.patch
deleted file mode 100644
index eb9de9a..0000000
--- a/debian/patches/libfaad-drm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Julian Cable <julian_cable at yahoo.com>
-Description: build the DRM version of the library as well as the normal version
-
---- a/libfaad/Makefile.am
-+++ b/libfaad/Makefile.am
-@@ -1,4 +1,4 @@
--lib_LTLIBRARIES = libfaad.la
-+lib_LTLIBRARIES = libfaad.la libfaad_drm.la
-
- AM_CPPFLAGS = -iquote $(top_srcdir)/include
- include_HEADERS = $(top_srcdir)/include/faad.h \
-@@ -29,3 +29,8 @@ libfaad_la_SOURCES = bits.c cfft.c decod
- codebook/hcb_1.h codebook/hcb_2.h codebook/hcb_3.h codebook/hcb_4.h \
- codebook/hcb_5.h codebook/hcb_6.h codebook/hcb_7.h codebook/hcb_8.h \
- codebook/hcb_9.h codebook/hcb_10.h codebook/hcb_11.h codebook/hcb_sf.h
-+
-+libfaad_drm_la_LDFLAGS = ${libfaad_la_LDFLAGS}
-+libfaad_drm_la_LIBADD = ${libfaad_la_LIBADD}
-+libfaad_drm_la_CFLAGS = ${libfaad_la_CFLAGS} -DDRM -DDRM_PS
-+libfaad_drm_la_SOURCES = ${libfaad_la_SOURCES}
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
deleted file mode 100644
index eeb1f57..0000000
--- a/debian/patches/manpage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix hyphen in manpage.
-==========================================================================
---- a/frontend/faad.man
-+++ b/frontend/faad.man
-@@ -24,9 +24,9 @@
- .br
- 3: 32\(hybit PCM data.
- .br
--4: 32\(hybit floating\hy(point data.
-+4: 32\(hybit floating\(hypoint data.
- .br
--5: 64\(hybit floating\hy(point data.
-+5: 64\(hybit floating\(hypoint data.
- .RE
- .RE
- .TP
diff --git a/debian/patches/noinst-mp4ff.patch b/debian/patches/noinst-mp4ff.patch
deleted file mode 100644
index 7a4d594..0000000
--- a/debian/patches/noinst-mp4ff.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: libmp4ff ist not packaged, so do not install it either.
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-
---- faad2.orig/common/mp4ff/Makefile.am
-+++ faad2/common/mp4ff/Makefile.am
-@@ -1,5 +1,5 @@
--lib_LIBRARIES = libmp4ff.a
--include_HEADERS = mp4ff.h mp4ffint.h
-+noinst_LIBRARIES = libmp4ff.a
-+noinst_HEADERS = mp4ff.h mp4ffint.h
-
- libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-
diff --git a/debian/patches/path_max.patch b/debian/patches/path_max.patch
deleted file mode 100644
index 553be0f..0000000
--- a/debian/patches/path_max.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Description: Dynamically allocate file name buffers.
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Bug-Ubuntu: https://launchpad.net/bugs/475050
-Last-Update: 2011-11-11
-
---- faad.orig/frontend/main.c
-+++ faad/frontend/main.c
-@@ -1107,9 +1107,9 @@ int main(int argc, char *argv[])
- int mp4file = 0;
- int noGapless = 0;
- char *fnp;
-- char aacFileName[255];
-- char audioFileName[255];
-- char adtsFileName[255];
-+ char *aacFileName = NULL;
-+ char *audioFileName = NULL;
-+ char *adtsFileName = NULL;
- unsigned char header[8];
- float length = 0;
- FILE *hMP4File;
-@@ -1157,6 +1157,12 @@ int main(int argc, char *argv[])
- if (optarg)
- {
- outfile_set = 1;
-+ audioFileName = (char *) malloc(sizeof(char) * (strlen(optarg) + 1));
-+ if (audioFileName == NULL)
-+ {
-+ faad_fprintf(stderr, "Error allocating memory for audioFileName.\n");
-+ return 1;
-+ }
- strcpy(audioFileName, optarg);
- }
- break;
-@@ -1164,6 +1170,12 @@ int main(int argc, char *argv[])
- if (optarg)
- {
- adts_out = 1;
-+ adtsFileName = (char *) malloc(sizeof(char) * (strlen(optarg) + 1));
-+ if (adtsFileName == NULL)
-+ {
-+ faad_fprintf(stderr, "Error allocating memory for adtsFileName.\n");
-+ return 1;
-+ }
- strcpy(adtsFileName, optarg);
- }
- break;
-@@ -1284,6 +1296,12 @@ int main(int argc, char *argv[])
- #endif
-
- /* point to the specified file name */
-+ aacFileName = (char *) malloc(sizeof(char) * (strlen(argv[optind]) + 1));
-+ if (aacFileName == NULL)
-+ {
-+ faad_fprintf(stderr, "Error allocating memory for aacFileName.\n");
-+ return 1;
-+ }
- strcpy(aacFileName, argv[optind]);
-
- #ifdef _WIN32
-@@ -1297,6 +1315,12 @@ int main(int argc, char *argv[])
- */
- if(!writeToStdio && !outfile_set)
- {
-+ audioFileName = (char *) malloc(sizeof(char) * (strlen(aacFileName) + strlen(file_ext[format]) + 1));
-+ if (audioFileName == NULL)
-+ {
-+ faad_fprintf(stderr, "Error allocating memory for audioFileName.\n");
-+ return 1;
-+ }
- strcpy(audioFileName, aacFileName);
-
- fnp = (char *)strrchr(audioFileName,'.');
-@@ -1357,6 +1381,11 @@ int main(int argc, char *argv[])
- old_format, &length);
- }
-
-+ if (audioFileName != NULL)
-+ free (audioFileName);
-+ if (adtsFileName != NULL)
-+ free (adtsFileName);
-+
- if (!result && !infoOnly)
- {
- #ifdef _WIN32
-@@ -1372,5 +1401,8 @@ int main(int argc, char *argv[])
- dec_length, length/dec_length);
- }
-
-+ if (aacFileName != NULL)
-+ free (aacFileName);
-+
- return 0;
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1fbdef4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,9 +0,0 @@
-autotools-compat.patch
-noinst-mp4ff.patch
-manpage.patch
-incorrect_pointer_size.patch
-bpa-stdin.patch
-path_max.patch
-fix_ftbfs_with_gcc4.5.patch
-symbol-visibility.patch
-libfaad-drm.patch
diff --git a/debian/patches/symbol-visibility.patch b/debian/patches/symbol-visibility.patch
deleted file mode 100644
index a74a9ee..0000000
--- a/debian/patches/symbol-visibility.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: Set appropriate symbol visibility attributes.
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-
---- a/include/neaacdec.h
-+++ b/include/neaacdec.h
-@@ -63,6 +63,10 @@ extern "C" {
- #ifndef NEAACDECAPI
- #define NEAACDECAPI __cdecl
- #endif
-+#elif defined(__GNUC__) && __GNUC__ >= 4
-+ #ifndef NEAACDECAPI
-+ #define NEAACDECAPI __attribute__((visibility("default")))
-+ #endif
- #else
- #ifndef NEAACDECAPI
- #define NEAACDECAPI
-@@ -198,7 +202,7 @@ typedef struct NeAACDecFrameInfo
- unsigned char ps;
- } NeAACDecFrameInfo;
-
--char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode);
-+char NEAACDECAPI *NeAACDecGetErrorMessage(unsigned char errcode);
-
- unsigned long NEAACDECAPI NeAACDecGetCapabilities(void);
-
-@@ -231,12 +235,12 @@ void NEAACDECAPI NeAACDecPostSeekReset(N
-
- void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder);
-
--void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
-+void NEAACDECAPI *NeAACDecDecode(NeAACDecHandle hDecoder,
- NeAACDecFrameInfo *hInfo,
- unsigned char *buffer,
- unsigned long buffer_size);
-
--void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder,
-+void NEAACDECAPI *NeAACDecDecode2(NeAACDecHandle hDecoder,
- NeAACDecFrameInfo *hInfo,
- unsigned char *buffer,
- unsigned long buffer_size,
---- a/libfaad/Makefile.am
-+++ b/libfaad/Makefile.am
-@@ -1,11 +1,12 @@
- lib_LTLIBRARIES = libfaad.la
-
--AM_CFLAGS = -iquote $(top_srcdir)/include
-+AM_CPPFLAGS = -iquote $(top_srcdir)/include
- include_HEADERS = $(top_srcdir)/include/faad.h \
- $(top_srcdir)/include/neaacdec.h
-
- libfaad_la_LDFLAGS = -version-info 2:0:0
- libfaad_la_LIBADD = -lm
-+libfaad_la_CFLAGS = -fvisibility=hidden
-
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
- drm_dec.c error.c filtbank.c \
---- a/libfaad/decoder.c
-+++ b/libfaad/decoder.c
-@@ -64,7 +64,7 @@ static void create_channel_config(NeAACD
- NeAACDecFrameInfo *hInfo);
-
-
--char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode)
-+char NEAACDECAPI *NeAACDecGetErrorMessage(unsigned char errcode)
- {
- if (errcode >= NUM_ERROR_MESSAGES)
- return NULL;
-@@ -787,7 +787,7 @@ static void create_channel_config(NeAACD
- }
- }
-
--void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hpDecoder,
-+void NEAACDECAPI *NeAACDecDecode(NeAACDecHandle hpDecoder,
- NeAACDecFrameInfo *hInfo,
- unsigned char *buffer,
- unsigned long buffer_size)
-@@ -796,7 +796,7 @@ void* NEAACDECAPI NeAACDecDecode(NeAACDe
- return aac_frame_decode(hDecoder, hInfo, buffer, buffer_size, NULL, 0);
- }
-
--void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hpDecoder,
-+void NEAACDECAPI *NeAACDecDecode2(NeAACDecHandle hpDecoder,
- NeAACDecFrameInfo *hInfo,
- unsigned char *buffer,
- unsigned long buffer_size,
--
faad2 packaging
More information about the pkg-multimedia-commits
mailing list