diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 17:24:46 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 17:24:46 +0000 |
commit | 1f40a5103be5b2947e716e8fd20152d1e9d7e294 (patch) | |
tree | e9ff8c339a074ac68a2d6df3fdfc0f2fc623a67b | |
parent | 5bf1926d0369530fc9fcf2e9a1745247c3f23431 (diff) |
Merged revisions 228441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r228441 | dvossel | 2009-11-06 11:22:31 -0600 (Fri, 06 Nov 2009) | 3 lines
Fixes merging issue from 1.4, frame data is held in data.ptr in trunk
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@228451 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | codecs/codec_ilbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index d54a1b4ba..ebff0c112 100644 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -117,7 +117,7 @@ static int ilbctolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) int16_t *dst = pvt->outbuf.i16; float tmpf[ILBC_SAMPLES]; - if (!f->data && f->datalen) { + if (!f->data.ptr && f->datalen) { ast_log(LOG_DEBUG, "issue 16070, ILIB ERROR. data = NULL datalen = %d src = %s\n", f->datalen, f->src ? f->src : "no src set"); f->datalen = 0; } |