diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 14:05:30 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 14:05:30 +0000 |
| commit | 933ddf410aee42eac51dfd9f3d5e5c4a98efaf22 (patch) | |
| tree | b7166e1e0969a7109403e9f88178ff8e12022b68 /codecs | |
| parent | 5bdb7dc6b72e49a4e20c00ad0345baed6169cf99 (diff) | |
go back to including libresample in the main Asterisk binary, but this time including a small hack to ensure that it does get linked in (and also modify the strip_nonapi script to leave the resample_<foo> symbols alone)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95816 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile | 2 | ||||
| -rw-r--r-- | codecs/codec_resample.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index ef76962e5..a09f67149 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -55,4 +55,4 @@ $(LIBG722): $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722) -codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/libresample/include +codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c index 718ab88ae..66d60169d 100644 --- a/codecs/codec_resample.c +++ b/codecs/codec_resample.c @@ -24,10 +24,6 @@ * \ingroup codecs */ -/*** MODULEINFO - <depend>res_resample</depend> - ***/ - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") |