[FFmpeg-soc] [soc]: r3979 - in wmapro: wma3.h wma3dec.c

[faust3]

Author: faust3
Date: Sat Jan 17 18:29:29 2009
New Revision: 3979

Log:
renamed wma_channel to WMA3ChannelCtx

Modified:
   wmapro/wma3.h
   wmapro/wma3dec.c

Modified: wmapro/wma3.h
==============================================================================
--- wmapro/wma3.h	Sat Jan 17 18:23:03 2009	(r3978)
+++ wmapro/wma3.h	Sat Jan 17 18:29:29 2009	(r3979)
@@ -67,7 +67,7 @@ typedef struct {
     int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted
     DECLARE_ALIGNED_16(float, out[8192]);
 
-} wma_channel;
+} WMA3ChannelCtx;
 
 typedef struct {
     int nb_channels;
@@ -151,7 +151,7 @@ typedef struct WMA3DecodeContext {
     int              nb_chgroups;              //< number of channel groups
     wma_channel_group chgroup[MAX_CHANNELS];   //< channel group information
 
-    wma_channel      channel[MAX_CHANNELS];    //< per channel data
+    WMA3ChannelCtx   channel[MAX_CHANNELS];    //< per channel data
 } WMA3DecodeContext;
 
 #endif /* AVCODEC_WMA3_H */

Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c	Sat Jan 17 18:23:03 2009	(r3978)
+++ wmapro/wma3dec.c	Sat Jan 17 18:29:29 2009	(r3979)
@@ -516,7 +516,7 @@ static int wma_decode_tilehdr(WMA3Decode
                 return -1;
             }
             for(c=0; c<s->nb_channels;c++){
-                wma_channel* chan = &s->channel[c];
+                WMA3ChannelCtx* chan = &s->channel[c];
                 if(chan->num_subframes > 32){
                     av_log(s->avctx, AV_LOG_ERROR,
                             "broken frame: num subframes %i\n",
@@ -769,7 +769,7 @@ static int decode_coeffs(WMA3DecodeConte
     int vlctable;
     VLC* vlc;
     int vlcmax;
-    wma_channel* ci = &s->channel[c];
+    WMA3ChannelCtx* ci = &s->channel[c];
     int rl_mode = 0;
     int cur_coeff = 0;
     int last_write = 0;