aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-06 17:22:31 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-06 17:22:31 +0000
commit164325c273a95094c1d52c29e493b6580a407578 (patch)
tree73fa3c81a4039ba65ab0cca8c04b4187081c5e04 /codecs
parentfb746bd765236570ed86435a08a6d12b2d1b74e2 (diff)
Fixes merging issue from 1.4, frame data is held in data.ptr in trunk
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@228441 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/codec_ilbc.c2
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;
}