[FFmpeg-soc] [soc]: r5015 - als/alsdec.c

[thilo.borgmann]

Author: thilo.borgmann
Date: Mon Aug 10 00:48:52 2009
New Revision: 5015

Log:
Reordered checks for independent block decoding to support an independently coded last channel in case of enabled block switching and joint-stereo.

Modified:
   als/alsdec.c

Modified: als/alsdec.c
==============================================================================
--- als/alsdec.c	Mon Aug 10 00:45:15 2009	(r5014)
+++ als/alsdec.c	Mon Aug 10 00:48:52 2009	(r5015)
@@ -686,15 +686,15 @@ static int read_frame_data(ALSDecContext
             parse_bs_info(bs_info, 0, 0, &ptr_div_blocks, &ctx->num_blocks);
             reconstruct_block_sizes(ctx, div_blocks);
 
-            // if this is the last channel, it has to be decoded independently
-            if (c == sconf->channels - 1)
-                independent_bs = 1;
-
             // if joint_stereo and block_switching is set, independent decoding
             // is signaled via the first bit of bs_info
             if(sconf->joint_stereo && sconf->block_switching)
                 independent_bs = bs_info >> 31;
 
+            // if this is the last channel, it has to be decoded independently
+            if (c == sconf->channels - 1)
+                independent_bs = 1;
+
             if (independent_bs) {
                 raw_samples = ctx->raw_samples[c];