[asterisk-commits] rmudgett: branch group/media_formats-reviewed-trunk r418799 - /team/group/med...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jul 16 18:21:01 2014
New Revision: 418799

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418799
Log:
bridge_softmix.c: Always replace the softmix channel write codec.

Modified:
    team/group/media_formats-reviewed-trunk/bridges/bridge_softmix.c

Modified: team/group/media_formats-reviewed-trunk/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/bridges/bridge_softmix.c?view=diff&rev=418799&r1=418798&r2=418799
==============================================================================
--- team/group/media_formats-reviewed-trunk/bridges/bridge_softmix.c (original)
+++ team/group/media_formats-reviewed-trunk/bridges/bridge_softmix.c Wed Jul 16 18:21:01 2014
@@ -944,10 +944,8 @@
 			ast_mutex_lock(&sc->lock);
 
 			/* Make SLINEAR write frame from local buffer */
-			/* BUGBUG: use ast_format_cmp ? */
-			if (sc->write_frame.subclass.format != cur_slin) {
-				ao2_replace(sc->write_frame.subclass.format, cur_slin);
-			}
+			ao2_t_replace(sc->write_frame.subclass.format, cur_slin,
+				"Replace softmix channel slin format");
 			sc->write_frame.datalen = softmix_datalen;
 			sc->write_frame.samples = softmix_samples;
 			memcpy(sc->final_buf, buf, softmix_datalen);