[svn-commits] mnicholson: trunk r250190 - in /trunk: include/asterisk/ res/

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Tue Mar  2 17:11:06 2010
New Revision: 250190

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250190
Log:
Merge res_fax and res_fax_spandsp.

Added:
    trunk/res/res_fax.c
      - copied unchanged from r250188, team/group/res_fax/res/res_fax.c
    trunk/res/res_fax.exports
      - copied unchanged from r250188, team/group/res_fax/res/res_fax.exports
    trunk/res/res_fax_spandsp.c
      - copied unchanged from r250188, team/group/res_fax/res/res_fax_spandsp.c
Modified:
    trunk/include/asterisk/frame.h

Modified: trunk/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/frame.h?view=diff&rev=250190&r1=250189&r2=250190
==============================================================================
--- trunk/include/asterisk/frame.h (original)
+++ trunk/include/asterisk/frame.h Tue Mar  2 17:11:06 2010
@@ -131,16 +131,18 @@
 	AST_FRFLAG_HAS_TIMING_INFO = (1 << 0),
 };
 
+union ast_frame_subclass {
+	int integer;
+	format_t codec;
+};
+
 /*! \brief Data structure associated with a single frame of data
  */
 struct ast_frame {
 	/*! Kind of frame */
 	enum ast_frame_type frametype;				
 	/*! Subclass, frame dependent */
-	union {
-		int integer;
-		format_t codec;
-	} subclass;
+	union ast_frame_subclass subclass;
 	/*! Length of data */
 	int datalen;				
 	/*! Number of samples in this frame */