diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 16:44:56 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 16:44:56 +0000 |
| commit | 9f140e558957b2039d82ec4288909107c72ed468 (patch) | |
| tree | 8cd0c6b40ec041f6796aeb868729aee93c198604 /main | |
| parent | b9a1c901f19dc207e4df452ad19db73a748480d7 (diff) | |
Merged revisions 228410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r228410 | file | 2009-11-06 12:42:23 -0400 (Fri, 06 Nov 2009) | 14 lines
Merged revisions 228409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r228409 | file | 2009-11-06 12:41:20 -0400 (Fri, 06 Nov 2009) | 7 lines
Fix a bug caused by a partially invalid frame (from the jitterbuffer) passing through the Asterisk core.
(closes issue #15560)
Reported by: jvandal
(closes issue #15709)
Reported by: covici
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@228413 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/abstract_jb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c index d7ff7354a..c325d3aca 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -387,7 +387,7 @@ static void jb_get_and_deliver(struct ast_channel *chan) struct ast_jb *jb = &chan->jb; struct ast_jb_impl *jbimpl = jb->impl; void *jbobj = jb->jbobj; - struct ast_frame *f, finterp; + struct ast_frame *f, finterp = { .frametype = AST_FRAME_VOICE, }; long now; int interpolation_len, res; @@ -416,13 +416,9 @@ static void jb_get_and_deliver(struct ast_channel *chan) case JB_IMPL_INTERP: /* interpolate a frame */ f = &finterp; - f->frametype = AST_FRAME_VOICE; f->subclass = jb->last_format; - f->datalen = 0; f->samples = interpolation_len * 8; - f->mallocd = 0; f->src = "JB interpolation"; - f->data.ptr = NULL; f->delivery = ast_tvadd(jb->timebase, ast_samp2tv(jb->next, 1000)); f->offset = AST_FRIENDLY_OFFSET; /* deliver the interpolated frame */ |