flacdec: use av_get_bytes_per_sample() to get sample size

SaschaVasarrhelyi · Oct 29, 2011 · 5bd0343 · 5bd0343
1 parent 272fcc3
commit 5bd0343
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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");