diff options
author | Jonathan Rose <jrose@digium.com> | 2014-09-19 15:11:06 +0000 |
---|---|---|
committer | Jonathan Rose <jrose@digium.com> | 2014-09-19 15:11:06 +0000 |
commit | 7e602175ff2d156fbdd940f63185fdff0c56d48f (patch) | |
tree | 3cf7e0cc06865c9b764e897f4579412d91b1538d /channels/chan_iax2.c | |
parent | 7f2623a26fcbeecf7b64b804d3d28e42bd8a2725 (diff) |
chan_iax2: Fix a crash when using chan_iax2 jitterbuffer settings
Caused by format changes in Asterisk 13
ASTERISK-24265 #close
Reported by: Dafi Ni
Review: https://reviewboard.asterisk.org/r/3999/
........
Merged revisions 423524 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@423526 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1f37904d0..a3fb34c23 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4123,7 +4123,7 @@ static void __get_from_jb(const void *p) if(ms >= (next = jb_next(pvt->jb))) { struct ast_format *voicefmt; voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat); - ret = jb_get(pvt->jb, &frame, ms, ast_format_get_default_ms(voicefmt)); + ret = jb_get(pvt->jb, &frame, ms, voicefmt ? ast_format_get_default_ms(voicefmt) : 20); switch(ret) { case JB_OK: fr = frame.data; |