From 8b769322843d56b380c65767647e70832bfe1f48 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Fri, 6 Nov 2009 17:24:08 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@228447 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/codec_ilbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index f7665649d3..3227dc80e3 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; }