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

[banan]

Author: banan
Date: Tue Apr 28 21:26:05 2009
New Revision: 4246

Log:
Fix channel layout for 5.1 wmapro files

Modified:
   wmapro/wma3dec.c

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Tue Apr 28 19:00:53 2009	(r4245)
+++ wmapro/wma3dec.c	Tue Apr 28 21:26:05 2009	(r4246)
@@ -1421,18 +1421,10 @@ static int wma_decode_frame(WMA3DecodeCo
     for(i = 0; i < s->num_channels; i++) {
         int16_t* ptr;
         int incr = s->num_channels;
-        /* FIXME: what about other channel layouts? */
-        const char layout[] = {0,1,4,5,2,3};
-        int chpos;
         float* iptr = s->channel[i].out;
         int x;
 
-        if(s->num_channels == 6){
-              chpos = layout[i];
-        }else
-              chpos = i;
-
-        ptr = s->samples + chpos;
+        ptr = s->samples + i;
 
         for(x=0;x<s->samples_per_frame;x++) {
             *ptr = av_clip_int16(lrintf(*iptr++));