[asterisk-commits] dvossel: branch 1.6.1 r228451 - in /branches/1.6.1: ./ codecs/codec_ilbc.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Nov  6 11:24:46 2009
New Revision: 228451

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228451
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/codecs/codec_ilbc.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/codecs/codec_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/codecs/codec_ilbc.c?view=diff&rev=228451&r1=228450&r2=228451
==============================================================================
--- branches/1.6.1/codecs/codec_ilbc.c (original)
+++ branches/1.6.1/codecs/codec_ilbc.c Fri Nov  6 11:24:46 2009
@@ -117,7 +117,7 @@
 	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;
 	}