diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 17:24:08 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 17:24:08 +0000 |
| commit | e500e3b278c09bc38a880141cb2ee0955e839f61 (patch) | |
| tree | 30bf4ad528ad0237bde40b1e84df78c03ec1257c /codecs | |
| parent | 522ef2e42d80237728e1f5cb28085ab40a820d1e (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.2@228447 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -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 f7665649d..3227dc80e 100644 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -88,7 +88,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; } |