[FFmpeg-soc] [soc]: r3263 - mlp/mlpenc.c

[ramiro]

Author: ramiro
Date: Thu Aug 14 06:09:46 2008
New Revision: 3263

Log:
Don't keep on comparing after a flag has already been set.

Modified:
   mlp/mlpenc.c

Modified: mlp/mlpenc.c
==============================================================================
--- mlp/mlpenc.c	(original)
+++ mlp/mlpenc.c	Thu Aug 14 06:09:46 2008
@@ -931,22 +931,28 @@ static int decoding_params_diff(MLPEncod
         retval |= PARAM_MATRIX;
 
     for (ch = 0; ch <= rh->max_matrix_channel; ch++)
-        if (prev->output_shift[ch] != dp->output_shift[ch])
+        if (prev->output_shift[ch] != dp->output_shift[ch]) {
             retval |= PARAM_OUTSHIFT;
+            break;
+        }
 
     for (ch = 0; ch <= rh->max_channel; ch++)
-        if (prev->quant_step_size[ch] != dp->quant_step_size[ch])
+        if (prev->quant_step_size[ch] != dp->quant_step_size[ch]) {
             retval |= PARAM_QUANTSTEP;
+            break;
+        }
 
     for (ch = rh->min_channel; ch <= rh->max_channel; ch++) {
         ChannelParams *prev_cp = &channel_params[ch];
         ChannelParams *cp = &ctx->channel_params[ch];
 
-        if (compare_filter_params(&prev_cp->filter_params[FIR],
+        if (!(retval & PARAM_FIR) &&
+            compare_filter_params(&prev_cp->filter_params[FIR],
                                   &     cp->filter_params[FIR]))
             retval |= PARAM_FIR;
 
-        if (compare_filter_params(&prev_cp->filter_params[IIR],
+        if (!(retval & PARAM_IIR) &&
+            compare_filter_params(&prev_cp->filter_params[IIR],
                                   &     cp->filter_params[IIR]))
             retval |= PARAM_IIR;