From ddecab2097e7c38eb0ef1a1cbd0f6465e8dbd1c3 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 22 Apr 2010 09:41:45 +0000
Subject: [PATCH] Set .supported_samplerates for mpeg audio encoders.
Originally committed as revision 22944 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/libmp3lame.c | 5 +++--
libavcodec/mpegaudioenc.c | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index 1bbb8dae359..1d74d6d59d2 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -81,8 +81,8 @@ err:
return -1;
}
-static const int sSampleRates[3] = {
- 44100, 48000, 32000
+static const int sSampleRates[] = {
+ 44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000, 0
};
static const int sBitRates[2][3][15] = {
@@ -224,5 +224,6 @@ AVCodec libmp3lame_encoder = {
MP3lame_encode_close,
.capabilities= CODEC_CAP_DELAY,
.sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+ .supported_samplerates= sSampleRates,
.long_name= NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"),
};
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c
index 70f76e87c2c..264175ecc55 100644
--- a/libavcodec/mpegaudioenc.c
+++ b/libavcodec/mpegaudioenc.c
@@ -798,6 +798,7 @@ AVCodec mp2_encoder = {
MPA_encode_close,
NULL,
.sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+ .supported_samplerates= (const int[]){44100, 48000, 32000, 22050, 24000, 16000, 0},
.long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
};
--
GitLab