[FFmpeg-cvslog] flacdec: use av_get_bytes_per_sample() to get sample size

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Oct 27 14:29:28 2011 -0400| [5bd0343bee1ed3df9cae1093bd909d07d07fa145] | committer: Justin Ruggles

flacdec: use av_get_bytes_per_sample() to get sample size

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bd0343bee1ed3df9cae1093bd909d07d07fa145
---

 libavcodec/flacdec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 633a138..95cf2bc 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -587,7 +587,8 @@ static int flac_decode_frame(AVCodecContext *avctx,
     bytes_read = (get_bits_count(&s->gb)+7)/8;
 
     /* check if allocated data size is large enough for output */
-    output_size = s->blocksize * s->channels * (s->is32 ? 4 : 2);
+    output_size = s->blocksize * s->channels *
+                  av_get_bytes_per_sample(avctx->sample_fmt);
     if (output_size > alloc_data_size) {
         av_log(s->avctx, AV_LOG_ERROR, "output data size is larger than "
                                        "allocated data size\n");