[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r329330 - /team/irroot/distrot...

[SVN commits to the Asterisk project]

Author: irroot
Date: Fri Jul 22 15:21:05 2011
New Revision: 329330

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329330
Log:
Changes between 10 and 1.8

Modified:
    team/irroot/distrotech-customers-1.8/res/res_fax.c

Modified: team/irroot/distrotech-customers-1.8/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/res/res_fax.c?view=diff&rev=329330&r1=329329&r2=329330
==============================================================================
--- team/irroot/distrotech-customers-1.8/res/res_fax.c (original)
+++ team/irroot/distrotech-customers-1.8/res/res_fax.c Fri Jul 22 15:21:05 2011
@@ -3051,15 +3051,15 @@
 
 	/* force silence on the line if T.38 negotiation might be taking place */
 	if (gateway->t38_state != T38_STATE_UNAVAILABLE && gateway->t38_state != T38_STATE_REJECTED) {
-		if (f->frametype == AST_FRAME_VOICE && f->subclass.format.id == AST_FORMAT_SLINEAR) {
+		if (f->frametype == AST_FRAME_VOICE && f->subclass.codec == AST_FORMAT_SLINEAR) {
 			short silence_buf[f->samples];
 			struct ast_frame silence_frame = {
 				.frametype = AST_FRAME_VOICE,
 				.data.ptr = silence_buf,
 				.samples = f->samples,
 				.datalen = sizeof(silence_buf),
+				.subclass.codec = AST_FORMAT_SLINEAR,
 			};
-			ast_format_set(&silence_frame.subclass.format, AST_FORMAT_SLINEAR, 0);
 			memset(silence_buf, 0, sizeof(silence_buf));
 
 			return ast_frisolate(&silence_frame);