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

[ramiro]

Author: ramiro
Date: Wed Aug 20 23:28:46 2008
New Revision: 3488

Log:
Move default param_presence_flags out of its own function.
The simplifications I thought I could achieve were not needed.

Modified:
   mlp/mlpenc.c

Modified: mlp/mlpenc.c
==============================================================================
--- mlp/mlpenc.c	(original)
+++ mlp/mlpenc.c	Wed Aug 20 23:28:46 2008
@@ -281,21 +281,6 @@ static void clear_channel_params(Channel
     }
 }
 
-static uint8_t default_param_presence_flags()
-{
-    uint8_t param_presence_flags = 0;
-
-    param_presence_flags |= PARAM_BLOCKSIZE;
-    param_presence_flags |= PARAM_MATRIX;
-    param_presence_flags |= PARAM_OUTSHIFT;
-    param_presence_flags |= PARAM_QUANTSTEP;
-    param_presence_flags |= PARAM_FIR;
-/*  param_presence_flags |= PARAM_IIR; */
-    param_presence_flags |= PARAM_HUFFOFFSET;
-
-    return param_presence_flags;
-}
-
 static void default_decoding_params(MLPEncodeContext *ctx,
      DecodingParams decoding_params[MAX_SUBSTREAMS])
 {
@@ -305,9 +290,19 @@ static void default_decoding_params(MLPE
 
     for (substr = 0; substr < MAX_SUBSTREAMS; substr++) {
         DecodingParams *dp = &decoding_params[substr];
+        uint8_t param_presence_flags = 0;
 
         dp->num_primitive_matrices = ctx->avctx->channels - 1;
-        dp->param_presence_flags = default_param_presence_flags();
+
+        param_presence_flags |= PARAM_BLOCKSIZE;
+        param_presence_flags |= PARAM_MATRIX;
+        param_presence_flags |= PARAM_OUTSHIFT;
+        param_presence_flags |= PARAM_QUANTSTEP;
+        param_presence_flags |= PARAM_FIR;
+/*      param_presence_flags |= PARAM_IIR; */
+        param_presence_flags |= PARAM_HUFFOFFSET;
+
+        dp->param_presence_flags = param_presence_flags;
     }
 }