diff options
author | Sascha Sommer <saschasommer@freenet.de> | 2009-06-20 09:05:28 +0000 |
---|---|---|
committer | Sascha Sommer <saschasommer@freenet.de> | 2009-06-20 09:05:28 +0000 |
commit | 9970c61b4b85e1df8e109aef2ba003673823e722 (patch) | |
tree | eeff3ab6f3fc7ca34b808877eda7fd93839bf60e /libavcodec/wmadec.c | |
parent | 9ed3afcb7fe524dee315e800d17f94aa34b8d0b1 (diff) | |
download | ffmpeg-9970c61b4b85e1df8e109aef2ba003673823e722.tar.gz |
Introduce WMACoef typedef for decoded coefficients
and change default type to float so that the run level
decoding functionality can be shared with wmapro
Originally committed as revision 19231 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/wmadec.c')
-rw-r--r-- | libavcodec/wmadec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 9dc6ff1810..7a65003457 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -486,12 +486,12 @@ static int wma_decode_block(WMACodecContext *s) for(ch = 0; ch < s->nb_channels; ch++) { if (s->channel_coded[ch]) { int tindex; - int16_t* ptr = &s->coefs1[ch][0]; + WMACoef* ptr = &s->coefs1[ch][0]; /* special VLC tables are used for ms stereo because there is potentially less energy there */ tindex = (ch == 1 && s->ms_stereo); - memset(ptr, 0, s->block_len * sizeof(int16_t)); + memset(ptr, 0, s->block_len * sizeof(WMACoef)); ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], s->level_table[tindex], s->run_table[tindex], 0, ptr, 0, nb_coefs[ch], @@ -514,7 +514,7 @@ static int wma_decode_block(WMACodecContext *s) /* finally compute the MDCT coefficients */ for(ch = 0; ch < s->nb_channels; ch++) { if (s->channel_coded[ch]) { - int16_t *coefs1; + WMACoef *coefs1; float *coefs, *exponents, mult, mult1, noise; int i, j, n, n1, last_high_band, esize; float exp_power[HIGH_BAND_MAX_SIZE]; |