diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-12-10 15:51:25 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-12-11 18:55:16 +0000 |
| commit | 4424fe9c029ccefc5868823b4967c792e51487f3 (patch) | |
| tree | ff7adae33ad1f6b452f164bf379656f71f7b02bf | |
| parent | a09bb3ba5e018b81a659c199a84cd1d80c07d869 (diff) | |
| download | ffmpeg-4424fe9c029ccefc5868823b4967c792e51487f3.tar.gz | |
wmapro: use av_float2int()
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/wmaprodec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index b947eb800f..a1b82db60a 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -86,6 +86,7 @@ * subframe in order to reconstruct the output samples. */ +#include "libavutil/intfloat.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "internal.h" @@ -823,8 +824,8 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c) v1 = get_vlc2(&s->gb, vec1_vlc.table, VLCBITS, VEC1MAXDEPTH); if (v1 == HUFF_VEC1_SIZE - 1) v1 += ff_wma_get_large_val(&s->gb); - vals[i ] = ((av_alias32){ .f32 = v0 }).u32; - vals[i+1] = ((av_alias32){ .f32 = v1 }).u32; + vals[i ] = av_float2int(v0); + vals[i+1] = av_float2int(v1); } else { vals[i] = fval_tab[symbol_to_vec2[idx] >> 4 ]; vals[i+1] = fval_tab[symbol_to_vec2[idx] & 0xF]; |