[svn-commits] russell: trunk r86297 - in /trunk: ./ codecs/codec_zap.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Oct 18 10:57:30 2007
New Revision: 86297

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86297
Log:
Merged revisions 86296 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r86296 | russell | 2007-10-18 10:45:55 -0500 (Thu, 18 Oct 2007) | 3 lines

Execute the RELEASE operation on transcoder channels in the destroy callback.
(patch from jsloan)

........

Modified:
    trunk/   (props changed)
    trunk/codecs/codec_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/codecs/codec_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_zap.c?view=diff&rev=86297&r1=86296&r2=86297
==============================================================================
--- trunk/codecs/codec_zap.c (original)
+++ trunk/codecs/codec_zap.c Thu Oct 18 10:57:30 2007
@@ -218,6 +218,11 @@
 static void zap_destroy(struct ast_trans_pvt *pvt)
 {
 	struct pvt *ztp = pvt->pvt;
+	unsigned int x;
+
+	x = ZT_TCOP_RELEASE;
+	if (ioctl(ztp->fd, ZT_TRANSCODE_OP, &x))
+		ast_log(LOG_WARNING, "Failed to release transcoder channel: %s\n", strerror(errno));
 
 	ast_atomic_fetchadd_int(&channels.total, -1);
 	switch (ztp->hdr->dstfmt) {