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

ramiro subversion at mplayerhq.hu
Fri Aug 22 23:40:22 CEST 2008


Author: ramiro
Date: Fri Aug 22 23:40:22 2008
New Revision: 3542

Log:
Fix regression introduced in r3530.
The data for subblock 1 was being encoded in 24-bit.

Modified:
   mlp/mlpenc.c

Modified: mlp/mlpenc.c
==============================================================================
--- mlp/mlpenc.c	(original)
+++ mlp/mlpenc.c	Fri Aug 22 23:40:22 2008
@@ -1648,13 +1648,12 @@ static int mlp_encode_frame(AVCodecConte
             determine_filters        (ctx);
 
             for (index = 0; index < MAJOR_HEADER_INTERVAL; index++) {
-                ctx->sample_buffer = ctx->major_frame_buffer
-                                   + index * ctx->one_sample_buffer_size;
                 for (subblock = 0; subblock <= num_subblocks; subblock++) {
                     ctx->cur_decoding_params = &ctx->decoding_params[index][subblock][substr];
                     ctx->cur_channel_params = ctx->channel_params[index][subblock];
+                    determine_bits(ctx);
+                    ctx->sample_buffer += ctx->cur_decoding_params->blocksize * ctx->num_channels;
                     if (!subblock) {
-                        determine_bits(ctx);
                     } else {
                         num_subblocks = 0;
                     }



More information about the FFmpeg-soc mailing list