From 5bd0343bee1ed3df9cae1093bd909d07d07fa145 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 27 Oct 2011 14:29:28 -0400 Subject: flacdec: use av_get_bytes_per_sample() to get sample size --- libavcodec/flacdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/flacdec.c') diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 633a1386ae..95cf2bccb4 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"); -- cgit v1.2.3