[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase2 r307337 - /team/dvossel/fixtheworl...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Feb  9 16:21:47 2011
New Revision: 307337

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307337
Log:
Make use of the MIN macro, thanks to kpfleming for pointing it out.

Modified:
    team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c

Modified: team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c?view=diff&rev=307337&r1=307336&r2=307337
==============================================================================
--- team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c (original)
+++ team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c Wed Feb  9 16:21:47 2011
@@ -126,7 +126,7 @@
 		joint = 0;
 	}
 	/* take the lowest max bitrate */
-	attr_res->maxbitrate = attr1->maxbitrate < attr2->maxbitrate ? attr1->maxbitrate : attr2->maxbitrate;
+	attr_res->maxbitrate = MIN(attr1->maxbitrate, attr2->maxbitrate);
 
 	/* Only do dtx if both sides want it */
 	attr_res->dtx = attr1->dtx && attr2->dtx ? 1 : 0;