diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-23 23:19:53 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-23 11:35:46 -0400 |
| commit | d2604f9260669a56caeca16f4d8beed488c5e53d (patch) | |
| tree | 71a76708409326e40a401da8d9b708a55399b750 /libavcodec/wavpack.c | |
| parent | ddfb8e1adb34cb05010f5953859bcfe13521ceac (diff) | |
wavpack: calculate bpp using av_get_bytes_per_sample()
Diffstat (limited to 'libavcodec/wavpack.c')
| -rw-r--r-- | libavcodec/wavpack.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 5cd17b5de1..ec46fb166a 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -808,15 +808,13 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, } s->frame_flags = AV_RL32(buf); buf += 4; if(s->frame_flags&0x80){ - bpp = sizeof(float); avctx->sample_fmt = AV_SAMPLE_FMT_FLT; } else if((s->frame_flags&0x03) <= 1){ - bpp = 2; avctx->sample_fmt = AV_SAMPLE_FMT_S16; } else { - bpp = 4; avctx->sample_fmt = AV_SAMPLE_FMT_S32; } + bpp = av_get_bytes_per_sample(avctx->sample_fmt); samples = (uint8_t*)samples + bpp * wc->ch_offset; s->stereo = !(s->frame_flags & WV_MONO); |