aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libspeexdec.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-11-28 16:39:07 +0100
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-12-03 19:59:04 +0100
commite2fc6a01f66243da458cdb9352f35f87dd6cad34 (patch)
tree2215eeb10a51c0f83ccc33de314e68b47a386c07 /libavcodec/libspeexdec.c
parent03290ffb57b25734120024e6943c7feca7bf2060 (diff)
downloadffmpeg-e2fc6a01f66243da458cdb9352f35f87dd6cad34.tar.gz
libspeex: allow custom sample rates again.
This was broken by 3b061c5e10f78caaf3b2a45cf7a92e50d4d20bfb Fixes trac issue #1974. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec/libspeexdec.c')
-rw-r--r--libavcodec/libspeexdec.c4
1 files changed, 3 insertions, 1 deletions
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 */