virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

alacdec: set bytespersample using av_get_bytes_per_sample()

Browse Source
This commit is contained in:
Justin Ruggles 2011-10-05 19:42:26 -04:00
parent d6174bfe5f
commit aec8383348
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/alac.c
View File

@ -493,15 +493,14 @@ static int alac_decode_frame(AVCodecContext *avctx,
switch (alac->setinfo_sample_size) { switch (alac->setinfo_sample_size) {
case 16: avctx->sample_fmt = AV_SAMPLE_FMT_S16; case 16: avctx->sample_fmt = AV_SAMPLE_FMT_S16;
alac->bytespersample = channels << 1;
break; break;
case 24: avctx->sample_fmt = AV_SAMPLE_FMT_S32; case 24: avctx->sample_fmt = AV_SAMPLE_FMT_S32;
alac->bytespersample = channels << 2;
break; break;
default: av_log(avctx, AV_LOG_ERROR, "Sample depth %d is not supported.\n", default: av_log(avctx, AV_LOG_ERROR, "Sample depth %d is not supported.\n",
alac->setinfo_sample_size); alac->setinfo_sample_size);
return -1; return -1;
} }
alac->bytespersample = channels * av_get_bytes_per_sample(avctx->sample_fmt);
if(outputsamples > *outputsize / alac->bytespersample){ if(outputsamples > *outputsize / alac->bytespersample){
av_log(avctx, AV_LOG_ERROR, "sample buffer too small\n"); av_log(avctx, AV_LOG_ERROR, "sample buffer too small\n");