Diff
Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (16320 => 16321)
--- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile 2010-01-15 17:34:01 UTC (rev 16320)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile 2010-01-15 17:35:26 UTC (rev 16321)
@@ -1,7 +1,9 @@
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)
include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (16320 => 16321)
--- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c 2010-01-15 17:34:01 UTC (rev 16320)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c 2010-01-15 17:35:26 UTC (rev 16321)
@@ -38,7 +38,7 @@
SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL);
#ifndef G729_PASSTHROUGH
-#include "g729ab.h"
+#include "g729.h"
struct g729_context {
struct dec_state decoder_object;
Modified: freeswitch/trunk/src/switch_core_sqldb.c (16320 => 16321)
--- freeswitch/trunk/src/switch_core_sqldb.c 2010-01-15 17:34:01 UTC (rev 16320)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2010-01-15 17:35:26 UTC (rev 16321)
@@ -1256,9 +1256,6 @@
switch_core_hash_init(&sql_manager.dbh_hash, sql_manager.memory_pool);
- if (!manage) {
- return SWITCH_STATUS_SUCCESS;
- }
top:
/* Activate SQL database */
Modified: freeswitch/trunk/src/switch_ivr_originate.c (16320 => 16321)
--- freeswitch/trunk/src/switch_ivr_originate.c 2010-01-15 17:34:01 UTC (rev 16320)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2010-01-15 17:35:26 UTC (rev 16321)
@@ -2609,7 +2609,7 @@
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_status_t b_status = SWITCH_STATUS_FALSE;
- switch_frame_t *b_frame = NULL;
+ switch_frame_t *b_frame;
if (b_channel && b_session) {
b_status = switch_core_session_read_frame(b_session, &b_frame, SWITCH_IO_FLAG_NONE, 0);