kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 66437 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66437 | file | 2007-05-29 12:44:34 -0400 (Tue, 29 May 2007) | 2 lines

Handle cases where a frame may have no data. (issue #9519 reported by dmb)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66438 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-05-29 16:46:49 +00:00
parent 0b67a7d80a
commit ed4726769a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/rtp.c
View File

@@ -2862,7 +2862,7 @@ int ast_rtp_write(struct ast_rtp *rtp, struct ast_frame *_f)
ast_smoother_feed(rtp->smoother, _f); ast_smoother_feed(rtp->smoother, _f);
} }
while ((f = ast_smoother_read(rtp->smoother))) while ((f = ast_smoother_read(rtp->smoother)) && (f->data))
ast_rtp_raw_write(rtp, f, codec); ast_rtp_raw_write(rtp, f, codec);
} else { } else {
/* Don't buffer outgoing frames; send them one-per-packet: */ /* Don't buffer outgoing frames; send them one-per-packet: */
@@ -2870,7 +2870,8 @@ int ast_rtp_write(struct ast_rtp *rtp, struct ast_frame *_f)
f = ast_frdup(_f); /*! \bug XXX this might never be free'd. Why do we do this? */ f = ast_frdup(_f); /*! \bug XXX this might never be free'd. Why do we do this? */
else else
f = _f; f = _f;
ast_rtp_raw_write(rtp, f, codec); if (f->data)
ast_rtp_raw_write(rtp, f, codec);
if (f != _f) if (f != _f)
ast_frfree(f); ast_frfree(f);
} }