[svn-commits] seanbright: branch 12 r410830 - in /branches/12: ./ res/res_fax_spandsp.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Tue Mar 18 06:51:24 2014
New Revision: 410830

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410830
Log:
res_fax_spandsp: Use g711_free() when available.

Per Johann Steinwendtner on the asterisk-dev mailing list:

http://lists.digium.com/pipermail/asterisk-dev/2014-March/066102.html

g711_free() was introduced in spandsp 0.0.6pre4 and g711_release() became a
noop.  I opted not to remove the call to g711_release() since it is harmless
and to call g711_free() if we have a sufficiently recent version of spandsp.

(issue ASTERISK-20149)
Reported by: Alexandr Gordeev
........

Merged revisions 410829 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/res/res_fax_spandsp.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_fax_spandsp.c?view=diff&rev=410830&r1=410829&r2=410830
==============================================================================
--- branches/12/res/res_fax_spandsp.c (original)
+++ branches/12/res/res_fax_spandsp.c Tue Mar 18 06:51:24 2014
@@ -677,6 +677,9 @@
 		ast_debug(5, "spandsp transcoding frame from %s to slinear for v21 detection\n", (f->subclass.format.id == AST_FORMAT_ALAW ? "G711_ALAW" : "G711_ULAW"));
 		modem_connect_tones_rx(p->tone_state, slndata, f->samples);
 		g711_release(decoder);
+#if SPANDSP_RELEASE_DATE >= 20090220
+		g711_free(decoder);
+#endif
 		ast_free(slndata);
 
 	/* frame in other formats cannot be passed to spandsp, it could cause segfault */