diff options
| author | David Vossel <dvossel@digium.com> | 2009-11-06 17:22:31 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-11-06 17:22:31 +0000 |
| commit | 8a80c1bd8cf0f60851923cb4f3ca850f9fb95103 (patch) | |
| tree | 73fa3c81a4039ba65ab0cca8c04b4187081c5e04 /codecs/codec_ilbc.c | |
| parent | ee5ecf3c3ecb914f6a0159640608b76743706ccd (diff) | |
Fixes merging issue from 1.4, frame data is held in data.ptr in trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@228441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/codec_ilbc.c')
| -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; } |