kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16321 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Rene 2010-01-15 17:35:26 +00:00
parent f861c00c85
commit ad7cc96015
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/codecs/mod_g729/Makefile
View File

@ -1,7 +1,9 @@
BASE=../../../.. BASE=../../../..
DIR=$(BASE)/libs/libg729
A=$(DIR)/.libs/libg729.a
LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include -I${DIR}" ; else echo "-DG729_PASSTHROUGH" ; fi ; DIR=$(switch_srcdir)/libs/libg729
BUILDDIR=$(switch_builddir)/libs/libg729
A=$(BUILDDIR)/.libs/libg729.a
LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
include $(BASE)/build/modmake.rules include $(BASE)/build/modmake.rules

2
src/mod/codecs/mod_g729/mod_g729.c
View File

@ -38,7 +38,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g729_load);
SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL); SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL);
#ifndef G729_PASSTHROUGH #ifndef G729_PASSTHROUGH
#include "g729ab.h" #include "g729.h"
struct g729_context { struct g729_context {
struct dec_state decoder_object; struct dec_state decoder_object;

3
src/switch_core_sqldb.c
View File

@ -1256,9 +1256,6 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
switch_core_hash_init(&sql_manager.dbh_hash, sql_manager.memory_pool); switch_core_hash_init(&sql_manager.dbh_hash, sql_manager.memory_pool);
if (!manage) {
return SWITCH_STATUS_SUCCESS;
}
top: top:
/* Activate SQL database */ /* Activate SQL database */

2
src/switch_ivr_originate.c
View File

@ -2609,7 +2609,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_channel_t *b_channel = originate_status[oglobals.bridge_early_media].peer_channel; switch_channel_t *b_channel = originate_status[oglobals.bridge_early_media].peer_channel;
switch_core_session_t *b_session = originate_status[oglobals.bridge_early_media].peer_session; switch_core_session_t *b_session = originate_status[oglobals.bridge_early_media].peer_session;
switch_status_t b_status = SWITCH_STATUS_FALSE; switch_status_t b_status = SWITCH_STATUS_FALSE;
switch_frame_t *b_frame = NULL; switch_frame_t *b_frame;
if (b_channel && b_session) { if (b_channel && b_session) {
b_status = switch_core_session_read_frame(b_session, &b_frame, SWITCH_IO_FLAG_NONE, 0); b_status = switch_core_session_read_frame(b_session, &b_frame, SWITCH_IO_FLAG_NONE, 0);