summaryrefslogtreecommitdiff
path: root/libavcodec/libopencore-amr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-02 23:46:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-02 23:47:58 +0100
commit0aaf0a07d490fba6e0262959d5b0520aeb5cb4c3 (patch)
tree6af4f850995ef9df99014be90622a257e6a062ce /libavcodec/libopencore-amr.c
parent2c1e9383a275a1591cc4d42fcdaa18b753800334 (diff)
libopencore-amrdec: allow sampling rates other than 8khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopencore-amr.c')
-rw-r--r--libavcodec/libopencore-amr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index 2a7d252c67..8dac0c17b1 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -31,7 +31,8 @@ static void amr_decode_fix_avctx(AVCodecContext *avctx)
{
const int is_amr_wb = 1 + (avctx->codec_id == AV_CODEC_ID_AMR_WB);
- avctx->sample_rate = 8000 * is_amr_wb;
+ if (!avctx->sample_rate)
+ avctx->sample_rate = 8000 * is_amr_wb;
if (avctx->channels > 1) {
av_log_missing_feature(avctx, "multi-channel AMR", 0);