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

[ramiro]

Author: ramiro
Date: Fri Aug 22 01:47:22 2008
New Revision: 3524

Log:
Set blocksize for restart frame outside of write_substr().

Modified:
   mlp/mlpenc.c

Modified: mlp/mlpenc.c
==============================================================================
--- mlp/mlpenc.c	(original)
+++ mlp/mlpenc.c	Fri Aug 22 01:47:22 2008
@@ -1451,7 +1451,6 @@ static uint8_t *write_substrs(MLPEncodeC
 
             if (num_subblocks) {
                 if (!subblock) {
-                    dp->blocksize = 8;
                     ctx->subblock_index = 0;
 
                     backup_sample_buffer = ctx->sample_buffer;
@@ -1464,8 +1463,6 @@ static uint8_t *write_substrs(MLPEncodeC
                     ctx->subblock_index = 1;
                     dp = &ctx->decoding_params[ctx->frame_index][ctx->subblock_index][substr];
 
-                    dp->blocksize = ctx->frame_size[ctx->frame_index] - 8;
-
                     restart_frame = 0;
                 }
             } else {
@@ -1615,6 +1612,8 @@ static int mlp_encode_frame(AVCodecConte
                 DecodingParams *dp = &ctx->decoding_params[index][subblock][substr];
                 dp->blocksize = ctx->frame_size[index];
             }
+            ctx->decoding_params[ctx->frame_index][0][substr].blocksize = 8;
+            ctx->decoding_params[ctx->frame_index][1][substr].blocksize = ctx->frame_size[ctx->frame_index] - 8;
             lossless_matrix_coeffs   (ctx, substr);
             output_shift_channels    (ctx, substr);
             rematrix_channels        (ctx, substr);