mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-20 12:20:12 +00:00
Update to work around G.729 compile issues, for now
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1119 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -16,11 +16,21 @@ ifndef ASTETCDIR
|
||||
ASTETCDIR=/etc/asterisk
|
||||
endif
|
||||
|
||||
CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
|
||||
CFLAGS = -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations
|
||||
CFLAGS += -DP_LINUX -D_REENTRANT -D_GNU_SOURCE
|
||||
#Uncomment if u want to attempt to include the G.729 stuff
|
||||
# This is a quick fix to work around the missing H323Capability
|
||||
# in Open H.323
|
||||
#
|
||||
#CFLAGS += -DWANT_G729
|
||||
#
|
||||
# This needs to be updated to deal with more than just little endian machines
|
||||
#
|
||||
CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
|
||||
|
||||
# Only change below if you know WTF your doing
|
||||
#
|
||||
CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
|
||||
CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations
|
||||
CFLAGS += -DP_LINUX -D_REENTRANT -D_GNU_SOURCE
|
||||
CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
|
||||
CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
|
||||
CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include
|
||||
|
@@ -29,7 +29,10 @@ Warning: Older versions than listed will NOT work, but newer versions
|
||||
~should~ work but are untested and you would be on your own.
|
||||
|
||||
As of June 16th, 2003 the release version of Open H.323 does not compile
|
||||
due to the G729Capability is missing.
|
||||
due to the G729Capability is missing. If you want G.729 support see
|
||||
the Makefile.
|
||||
|
||||
|
||||
|
||||
|
||||
Most common compile error:
|
||||
|
@@ -776,10 +776,12 @@ int h323_set_capability(int cap, int dtmfMode)
|
||||
endPoint->SetCapability(0, 0, new SpeexNarrow6AudioCapability());
|
||||
}
|
||||
|
||||
#if WANT_G729
|
||||
if (cap & AST_FORMAT_G729A) {
|
||||
H323_G729ACapability *g729aCap;
|
||||
endPoint->SetCapability(0, 0, g729aCap = new H323_G729ACapability);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (cap & AST_FORMAT_G723_1) {
|
||||
H323_G7231Capability *g7231Cap;
|
||||
|
@@ -1551,7 +1551,7 @@ int reload(void)
|
||||
if (gatekeeper_disable == 0) {
|
||||
if (h323_set_gk(gatekeeper_discover, gatekeeper, secret)) {
|
||||
ast_log(LOG_ERROR, "Gatekeeper registration failed.\n");
|
||||
// h323_end_process();
|
||||
h323_end_process();
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user