aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-29 16:25:43 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-29 16:25:43 +0000
commit594c1cc09ba6ea5d18a57edc4771daa30f174649 (patch)
tree160ecf9bc1a5887961918d530c96d6a397323e78
parentcbd418b48baf73ee5d6e51802bf2695fe7f321e1 (diff)
Don't blow up if get_codec() was not provided in the RTP glue.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@280391 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/rtp_engine.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index d23056b5f..02c453ff9 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -1383,10 +1383,10 @@ void ast_rtp_instance_early_bridge_make_compatible(struct ast_channel *c0, struc
if (video_glue1_res != AST_RTP_GLUE_RESULT_FORBID && (audio_glue1_res != AST_RTP_GLUE_RESULT_REMOTE || video_glue1_res != AST_RTP_GLUE_RESULT_REMOTE)) {
audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
}
- if (audio_glue0_res == AST_RTP_GLUE_RESULT_REMOTE && (video_glue0_res == AST_RTP_GLUE_RESULT_FORBID || video_glue0_res == AST_RTP_GLUE_RESULT_REMOTE) && glue0->get_codec(c0)) {
+ if (audio_glue0_res == AST_RTP_GLUE_RESULT_REMOTE && (video_glue0_res == AST_RTP_GLUE_RESULT_FORBID || video_glue0_res == AST_RTP_GLUE_RESULT_REMOTE) && glue0->get_codec) {
codec0 = glue0->get_codec(c0);
}
- if (audio_glue1_res == AST_RTP_GLUE_RESULT_REMOTE && (video_glue1_res == AST_RTP_GLUE_RESULT_FORBID || video_glue1_res == AST_RTP_GLUE_RESULT_REMOTE) && glue1->get_codec(c1)) {
+ if (audio_glue1_res == AST_RTP_GLUE_RESULT_REMOTE && (video_glue1_res == AST_RTP_GLUE_RESULT_FORBID || video_glue1_res == AST_RTP_GLUE_RESULT_REMOTE) && glue1->get_codec) {
codec1 = glue1->get_codec(c1);
}