aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfuqiuping <fu.qiuping@hotmail.com>2016-09-28 07:47:47 -0700
committerMichael Niedermayer <michael@niedermayer.cc>2016-11-06 22:46:25 +0100
commit2d72ea68f0edb72d96ec44bf50a1994cadc65f4c (patch)
tree68856e7eeb7fcadbf3849df0dc58b0a3a122357d
parentc6bc823eea6a7f6aaca14ee8a141277ea285e0f3 (diff)
downloadffmpeg-2d72ea68f0edb72d96ec44bf50a1994cadc65f4c.tar.gz
avformat/flvenc: support mp3 audio with 48khz
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/flvenc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index e50f8e4519..94f95ac4ba 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -107,6 +107,14 @@ static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par)
return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT;
} else {
switch (par->sample_rate) {
+ case 48000:
+ // 48khz mp3 is stored with 44k1 samplerate identifer
+ if (par->codec_id == AV_CODEC_ID_MP3) {
+ flags |= FLV_SAMPLERATE_44100HZ;
+ break;
+ } else {
+ goto error;
+ }
case 44100:
flags |= FLV_SAMPLERATE_44100HZ;
break;
@@ -124,6 +132,7 @@ static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par)
break;
}
default:
+error:
av_log(s, AV_LOG_ERROR,
"FLV does not support sample rate %d, "
"choose from (44100, 22050, 11025)\n", par->sample_rate);