From ba5fc967f6bd1d9866bcf52880da99dd8f1f5520 Mon Sep 17 00:00:00 2001 From: Benjamin Larsson Date: Sun, 26 Oct 2008 10:14:16 +0000 Subject: [PATCH] Disable codec downmix when not using simd instead of silently produce silence Originally committed as revision 15715 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dca.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 5565afb47d..aa89e848b5 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -1204,11 +1204,6 @@ static av_cold int dca_decode_init(AVCodecContext * avctx) dsputil_init(&s->dsp, avctx); ff_mdct_init(&s->imdct, 6, 1); - /* allow downmixing to stereo */ - if (avctx->channels > 0 && avctx->request_channels < avctx->channels && - avctx->request_channels == 2) { - avctx->channels = avctx->request_channels; - } for(i = 0; i < 6; i++) s->samples_chanptr[i] = s->samples + i * 256; avctx->sample_fmt = SAMPLE_FMT_S16; @@ -1219,6 +1214,12 @@ static av_cold int dca_decode_init(AVCodecContext * avctx) } else { s->add_bias = 0.0f; s->scale_bias = 1.0; + + /* allow downmixing to stereo */ + if (avctx->channels > 0 && avctx->request_channels < avctx->channels && + avctx->request_channels == 2) { + avctx->channels = avctx->request_channels; + } }