57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
diff -up libsndfile-1.0.27/src/gsm610.c.systemgsm libsndfile-1.0.27/src/gsm610.c
|
|
--- libsndfile-1.0.27/src/gsm610.c.systemgsm 2016-04-01 23:08:53.000000000 +0200
|
|
+++ libsndfile-1.0.27/src/gsm610.c 2016-11-11 19:12:06.749656521 +0100
|
|
@@ -27,7 +27,7 @@
|
|
#include "sfendian.h"
|
|
#include "common.h"
|
|
#include "wavlike.h"
|
|
-#include "GSM610/gsm.h"
|
|
+#include <gsm.h>
|
|
|
|
#define GSM610_BLOCKSIZE 33
|
|
#define GSM610_SAMPLES 160
|
|
@@ -391,7 +391,8 @@ gsm610_seek (SF_PRIVATE *psf, int UNUSED
|
|
psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
|
|
pgsm610->blockcount = 0 ;
|
|
|
|
- gsm_init (pgsm610->gsm_data) ;
|
|
+ gsm_destroy (pgsm610->gsm_data) ;
|
|
+ pgsm610->gsm_data = gsm_create () ;
|
|
if ((SF_CONTAINER (psf->sf.format)) == SF_FORMAT_WAV ||
|
|
(SF_CONTAINER (psf->sf.format)) == SF_FORMAT_W64)
|
|
gsm_option (pgsm610->gsm_data, GSM_OPT_WAV49, &true_flag) ;
|
|
diff -up libsndfile-1.0.27/src/Makefile.am.systemgsm libsndfile-1.0.27/src/Makefile.am
|
|
--- libsndfile-1.0.27/src/Makefile.am.systemgsm 2016-11-11 19:10:05.220551515 +0100
|
|
+++ libsndfile-1.0.27/src/Makefile.am 2016-11-11 19:10:14.315634212 +0100
|
|
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libsndfile.la
|
|
include_HEADERS = sndfile.hh
|
|
nodist_include_HEADERS = sndfile.h
|
|
|
|
-noinst_LTLIBRARIES = GSM610/libgsm.la G72x/libg72x.la ALAC/libalac.la libcommon.la
|
|
+noinst_LTLIBRARIES = G72x/libg72x.la ALAC/libalac.la libcommon.la
|
|
|
|
SYMBOL_FILES = Symbols.gnu-binutils Symbols.darwin libsndfile-1.def Symbols.os2 Symbols.static
|
|
|
|
@@ -46,7 +46,7 @@ endif
|
|
libsndfile_la_LDFLAGS = -no-undefined -version-info $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG)
|
|
libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS)
|
|
nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS)
|
|
-libsndfile_la_LIBADD = GSM610/libgsm.la G72x/libg72x.la ALAC/libalac.la \
|
|
+libsndfile_la_LIBADD = -lgsm G72x/libg72x.la ALAC/libalac.la \
|
|
libcommon.la $(EXTERNAL_XIPH_LIBS) -lm
|
|
|
|
libcommon_la_SOURCES = $(COMMON)
|
|
@@ -54,12 +54,6 @@ libcommon_la_SOURCES = $(COMMON)
|
|
#======================================================================
|
|
# Subdir libraries.
|
|
|
|
-GSM610_libgsm_la_SOURCES = GSM610/config.h GSM610/gsm.h GSM610/gsm610_priv.h \
|
|
- GSM610/add.c GSM610/code.c GSM610/decode.c GSM610/gsm_create.c \
|
|
- GSM610/gsm_decode.c GSM610/gsm_destroy.c GSM610/gsm_encode.c \
|
|
- GSM610/gsm_option.c GSM610/long_term.c GSM610/lpc.c GSM610/preprocess.c \
|
|
- GSM610/rpe.c GSM610/short_term.c GSM610/table.c
|
|
-
|
|
G72x_libg72x_la_SOURCES = G72x/g72x.h G72x/g72x_priv.h \
|
|
G72x/g721.c G72x/g723_16.c G72x/g723_24.c G72x/g723_40.c G72x/g72x.c
|
|
|