shithub: opus-tools

Info  •  Files  •  Log  •  Branches

Fixes build against current libopus.

--- a/src/Makefile

+++ b/src/Makefile

@@ -1,6 +1,6 @@

 CC=gcc

 CFLAGS=-DHAVE_SYS_SOUNDCARD_H -O2 -g -c -Wall -DHAVE_GETOPT_H -DEXPORT= -DRANDOM_PREFIX=opustools -DOUTSIDE_SPEEX -DFLOATING_POINT

-INCLUDES=-I../../opus/src -I../../opus/libcelt

+INCLUDES=-I../../opus/include

 all: opusenc opusdec

@@ -8,10 +8,10 @@

 	$(CC) $(CFLAGS) $(INCLUDES) $< -o $@

 opusenc: opus_header.o wav_io.o opusenc.o resample.o

-	gcc opus_header.o wav_io.o opusenc.o resample.o -o opusenc ../../opus/float/.libs/libopus.a -lm -logg

+	gcc opus_header.o wav_io.o opusenc.o resample.o -o opusenc ../../opus/.libs/libopus.a -lm -logg

 opusdec: opus_header.o wav_io.o wave_out.o opusdec.o resample.o

-	gcc wave_out.o opus_header.o wav_io.o opusdec.o resample.o -o opusdec ../../opus/float/.libs/libopus.a -lm -logg

+	gcc wave_out.o opus_header.o wav_io.o opusdec.o resample.o -o opusdec ../../opus/.libs/libopus.a -lm -logg

 clean:

 	rm -f *.o opusenc opusdec

--- a/src/opusdec.c

+++ b/src/opusdec.c

@@ -418,7 +418,7 @@

    }

    if (!st)

    {

-      fprintf (stderr, "Decoder initialization failed: %s\n", opus_strerror(error));

+      fprintf (stderr, "Decoder initialization failed: %s\n", opus_strerror(err));

       return NULL;

    }

--- a/src/opusenc.c

+++ b/src/opusenc.c

@@ -321,7 +321,7 @@

    const char *opus_version;

    SpeexResamplerState *resampler=NULL;

    int extra_samples;

-   int signal = OPUS_SIGNAL_AUTO;

+   int signal = OPUS_AUTO;

    unsigned char mapping[256] = {0, 1};

    int err;