From d2604f9260669a56caeca16f4d8beed488c5e53d Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 23 Sep 2011 23:19:53 -0400 Subject: wavpack: calculate bpp using av_get_bytes_per_sample() --- libavcodec/wavpack.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavcodec/wavpack.c') 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); -- cgit v1.2.3