summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/codecs/libwma/wmadec.h1
-rw-r--r--apps/codecs/libwma/wmadeci.c6
2 files changed, 1 insertions, 6 deletions
diff --git a/apps/codecs/libwma/wmadec.h b/apps/codecs/libwma/wmadec.h
index 889d7dbba1..585e4b0aef 100644
--- a/apps/codecs/libwma/wmadec.h
+++ b/apps/codecs/libwma/wmadec.h
@@ -147,7 +147,6 @@ typedef struct WMADecodeContext
147 fixed32 noise_mult; /* XXX: suppress that and integrate it in the noise array */ 147 fixed32 noise_mult; /* XXX: suppress that and integrate it in the noise array */
148 /* lsp_to_curve tables */ 148 /* lsp_to_curve tables */
149 fixed32 lsp_cos_table[BLOCK_MAX_SIZE]; 149 fixed32 lsp_cos_table[BLOCK_MAX_SIZE];
150 fixed64 lsp_pow_e_table[256];
151 fixed32 lsp_pow_m_table1[(1 << LSP_POW_BITS)]; 150 fixed32 lsp_pow_m_table1[(1 << LSP_POW_BITS)];
152 fixed32 lsp_pow_m_table2[(1 << LSP_POW_BITS)]; 151 fixed32 lsp_pow_m_table2[(1 << LSP_POW_BITS)];
153 152
diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c
index cf95f9c2fa..d81b93ffe3 100644
--- a/apps/codecs/libwma/wmadeci.c
+++ b/apps/codecs/libwma/wmadeci.c
@@ -170,7 +170,7 @@ static void init_coef_vlc(VLC *vlc,
170int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx) 170int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx)
171{ 171{
172 172
173 int i, flags1, flags2; 173 int i, flags2;
174 fixed32 *window; 174 fixed32 *window;
175 uint8_t *extradata; 175 uint8_t *extradata;
176 fixed64 bps1; 176 fixed64 bps1;
@@ -206,15 +206,11 @@ int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx)
206 } 206 }
207 207
208 /* extract flag infos */ 208 /* extract flag infos */
209 flags1 = 0;
210 flags2 = 0; 209 flags2 = 0;
211 extradata = wfx->data; 210 extradata = wfx->data;
212 if (s->version == 1 && wfx->datalen >= 4) { 211 if (s->version == 1 && wfx->datalen >= 4) {
213 flags1 = extradata[0] | (extradata[1] << 8);
214 flags2 = extradata[2] | (extradata[3] << 8); 212 flags2 = extradata[2] | (extradata[3] << 8);
215 }else if (s->version == 2 && wfx->datalen >= 6){ 213 }else if (s->version == 2 && wfx->datalen >= 6){
216 flags1 = extradata[0] | (extradata[1] << 8) |
217 (extradata[2] << 16) | (extradata[3] << 24);
218 flags2 = extradata[4] | (extradata[5] << 8); 214 flags2 = extradata[4] | (extradata[5] << 8);
219 } 215 }
220 s->use_exp_vlc = flags2 & 0x0001; 216 s->use_exp_vlc = flags2 & 0x0001;