[FFmpeg-soc] [soc]: r5323 - wmapro/wmaprodec.c

faust3 subversion at mplayerhq.hu
Wed Aug 26 22:54:23 CEST 2009


Author: faust3
Date: Wed Aug 26 22:54:23 2009
New Revision: 5323

Log:
use FFMAX for calculating the maximum scale factor

Modified:
   wmapro/wmaprodec.c

Modified: wmapro/wmaprodec.c
==============================================================================
--- wmapro/wmaprodec.c	Wed Aug 26 22:49:34 2009	(r5322)
+++ wmapro/wmaprodec.c	Wed Aug 26 22:54:23 2009	(r5323)
@@ -947,8 +947,8 @@ static int decode_scale_factors(WMA3Deco
         /** calculate new scale factor maximum */
         s->channel[c].max_scale_factor = s->channel[c].scale_factors[0];
         for (sf = s->channel[c].scale_factors + 1; sf < sf_end; sf++) {
-            if (s->channel[c].max_scale_factor < *sf)
-                s->channel[c].max_scale_factor = *sf;
+            s->channel[c].max_scale_factor =
+                FFMAX(s->channel[c].max_scale_factor, *sf);
         }
 
     }


More information about the FFmpeg-soc mailing list