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.1@228451 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index d54a1b4bab23fcc92997cc67a0f71ce8987e717a..ebff0c11245b10d5e41c6bf3c7cc97b83c6bc59b 100644 (file)
--- 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;
        }