[FFmpeg-soc] [soc]: r4523 - wmapro/wma3dec.c

[faust3]

Author: faust3
Date: Wed Jun 24 20:09:12 2009
New Revision: 4523

Log:
Simplify subframe channel selection

Modified:
   wmapro/wma3dec.c

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Wed Jun 24 20:01:17 2009	(r4522)
+++ wmapro/wma3dec.c	Wed Jun 24 20:09:12 2009	(r4523)
@@ -562,7 +562,8 @@ static int decode_tilehdr(WMA3DecodeCont
                         "broken frame: zero frames for subframe_len\n");
                     return -1;
                 }
-            }
+            } else
+                channel_mask = -1;
 
             /** if we have the choice get next subframe length from the
                 bitstream */
@@ -602,8 +603,7 @@ static int decode_tilehdr(WMA3DecodeCont
                 /** add subframes to the individual channels */
                 if (min_channel_len == chan->channel_len) {
                     --channels_for_cur_subframe;
-                    if (!read_channel_mask ||
-                       channel_mask & (1<<channels_for_cur_subframe)) {
+                    if (channel_mask & (1<<channels_for_cur_subframe)) {
                         if (chan->num_subframes >= MAX_SUBFRAMES) {
                             av_log(s->avctx, AV_LOG_ERROR,
                                     "broken frame: num subframes > 31\n");