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

ramiro subversion at mplayerhq.hu
Mon Apr 20 04:29:01 CEST 2009


Author: ramiro
Date: Mon Apr 20 04:29:01 2009
New Revision: 4206

Log:
Merge 2 if statements.

Modified:
   mlp/mlpenc.c

Modified: mlp/mlpenc.c
==============================================================================
--- mlp/mlpenc.c	Mon Apr 20 04:28:39 2009	(r4205)
+++ mlp/mlpenc.c	Mon Apr 20 04:29:01 2009	(r4206)
@@ -1752,13 +1752,11 @@ static void determine_bits(MLPEncodeCont
 
         if (!cp->filter_params[FIR].order) {
             no_codebook_bits(ctx, channel, min, max, &ctx->cur_best_offset[channel][0]);
+            offset = av_clip(average, HUFF_OFFSET_MIN, HUFF_OFFSET_MAX);
         } else {
             no_codebook_bits_offset(ctx, channel, offset, min, max, &ctx->cur_best_offset[channel][0]);
         }
 
-        if (!cp->filter_params[FIR].order)
-            offset = av_clip(average, HUFF_OFFSET_MIN, HUFF_OFFSET_MAX);
-
         for (i = 1; i < NUM_CODEBOOKS; i++) {
             BestOffset temp_bo = { 0, INT_MAX, 0, 0, 0, };
             int16_t offset_max;


More information about the FFmpeg-soc mailing list