summaryrefslogtreecommitdiff
path: root/libavcodec/alac.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-10-05 19:42:26 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-10-26 11:50:15 -0400
commitaec8383348de1b7d38fc2b0c7a31a9da5c79ce0d (patch)
tree342267d89c4dacf986e3cd935b310cbd318379fe /libavcodec/alac.c
parentd6174bfe5f7f9b4f9dbb580080e55e71705689f7 (diff)
alacdec: set bytespersample using av_get_bytes_per_sample()
Diffstat (limited to 'libavcodec/alac.c')
-rw-r--r--libavcodec/alac.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 3580b5096c..cb90f128ea 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -493,15 +493,14 @@ static int alac_decode_frame(AVCodecContext *avctx,
switch (alac->setinfo_sample_size) {
case 16: avctx->sample_fmt = AV_SAMPLE_FMT_S16;
- alac->bytespersample = channels << 1;
break;
case 24: avctx->sample_fmt = AV_SAMPLE_FMT_S32;
- alac->bytespersample = channels << 2;
break;
default: av_log(avctx, AV_LOG_ERROR, "Sample depth %d is not supported.\n",
alac->setinfo_sample_size);
return -1;
}
+ alac->bytespersample = channels * av_get_bytes_per_sample(avctx->sample_fmt);
if(outputsamples > *outputsize / alac->bytespersample){
av_log(avctx, AV_LOG_ERROR, "sample buffer too small\n");