From d9c6eece21dfecb510e33738092f7a43fc7d36f8 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 28 Oct 2011 00:31:11 -0400 Subject: gsm: use av_get_bytes_per_sample() in frame_bytes calculation --- libavcodec/gsmdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/gsmdec.c') diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 7c247a6b65..57286c796f 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -58,7 +58,8 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; int16_t *samples = data; - int frame_bytes = 2 * avctx->frame_size; + int frame_bytes = avctx->frame_size * + av_get_bytes_per_sample(avctx->sample_fmt); if (*data_size < frame_bytes) return -1; -- cgit v1.2.3