From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sat, 24 Sep 2011 03:19:53 +0000 (-0400)
Subject: wavpack: calculate bpp using av_get_bytes_per_sample()
X-Git-Tag: v0.8b1~953
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2604f9260669a56caeca16f4d8beed488c5e53d;p=platform%2Fupstream%2Flibav.git

wavpack: calculate bpp using av_get_bytes_per_sample()
---

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 5cd17b5..ec46fb1 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);