diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-07-29 16:26:13 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-07-29 16:26:13 +0000 |
| commit | 7855a973b46eac5d9c77ab787c01b3a8533870c4 (patch) | |
| tree | 91cfe48750c3fca225485e7f7262533a1a2ffde2 /main | |
| parent | b20da321c31d4c9146cf7ea2a38a11763c15db88 (diff) | |
Merged revisions 280391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r280391 | russell | 2010-07-29 11:25:43 -0500 (Thu, 29 Jul 2010) | 2 lines
Don't blow up if get_codec() was not provided in the RTP glue.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp_engine.c | 4 |
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); } |