RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set .supported_samplerates for mpeg audio encoders. 

Originally committed as revision 22944 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-04-22 09:41:45 +00:00
parent 10d0f5e035
commit ddecab2097
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/libmp3lame.c
View File

@ -81,8 +81,8 @@ err:
return -1; return -1;
} }
static const int sSampleRates[3] = { static const int sSampleRates[] = {
44100, 48000, 32000 44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000, 0
}; };
static const int sBitRates[2][3][15] = { static const int sBitRates[2][3][15] = {
@ -224,5 +224,6 @@ AVCodec libmp3lame_encoder = {
MP3lame_encode_close, MP3lame_encode_close,
.capabilities= CODEC_CAP_DELAY, .capabilities= CODEC_CAP_DELAY,
.sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, .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)"), .long_name= NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"),
}; };

1
libavcodec/mpegaudioenc.c
View File

@ -798,6 +798,7 @@ AVCodec mp2_encoder = {
MPA_encode_close, MPA_encode_close,
NULL, NULL,
.sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, .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)"), .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
}; };