RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/takdec: fix decoding of some sample rates with multichannel coder 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-04-17 00:13:55 +02:00
parent 3a727606c4
commit 7a0aee1688
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/takdec.c
View File

@ -163,8 +163,17 @@ static int set_bps_params(AVCodecContext *avctx)
static void set_sample_rate_params(AVCodecContext *avctx)
{
TAKDecContext *s = avctx->priv_data;
int shift = 3 - (avctx->sample_rate / 11025);
shift = FFMAX(0, shift);
int shift;
if (avctx->sample_rate < 11025) {
shift = 3;
} else if (avctx->sample_rate < 22050) {
shift = 2;
} else if (avctx->sample_rate < 44100) {
shift = 1;
} else {
shift = 0;
}
s->uval = FFALIGN(avctx->sample_rate + 511 >> 9, 4) << shift;
s->subframe_scale = FFALIGN(avctx->sample_rate + 511 >> 9, 4) << 1;
}