From e2fc6a01f66243da458cdb9352f35f87dd6cad34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Wed, 28 Nov 2012 16:39:07 +0100 Subject: libspeex: allow custom sample rates again. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was broken by 3b061c5e10f78caaf3b2a45cf7a92e50d4d20bfb Fixes trac issue #1974. Signed-off-by: Reimar Döffinger --- libavcodec/libspeexdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/libspeexdec.c') diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c index deed7e9eb5..935bebb1ce 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -51,6 +51,7 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_WARNING, "Invalid Speex header\n"); } if (header) { + avctx->sample_rate = header->rate; avctx->channels = header->nb_channels; spx_mode = header->mode; speex_header_free(header); @@ -73,8 +74,9 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Unknown Speex mode %d", spx_mode); return AVERROR_INVALIDDATA; } - avctx->sample_rate = 8000 << spx_mode; s->frame_size = 160 << spx_mode; + if (!avctx->sample_rate) + avctx->sample_rate = 8000 << spx_mode; if (avctx->channels < 1 || avctx->channels > 2) { /* libspeex can handle mono or stereo if initialized as stereo */ -- cgit v1.2.1