diff options
author | Damien Fetis <damien.fetis@altervoice.com> | 2012-06-28 16:28:56 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2012-06-28 16:53:09 +0200 |
commit | b92c7ee662b618518bff366af3274784fb141dde (patch) | |
tree | ab03526276e390b1ced02744244795158c603d78 /libavformat/flvdec.c | |
parent | 433492ac65e1f08f8614348a968b76e9e6420022 (diff) | |
download | ffmpeg-b92c7ee662b618518bff366af3274784fb141dde.tar.gz |
flv: add support for G.711
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/flvdec.c')
-rw-r--r-- | libavformat/flvdec.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 8e9759ba28..078c2a213e 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -108,6 +108,14 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, AVCodecCo case FLV_CODECID_NELLYMOSER: acodec->codec_id = CODEC_ID_NELLYMOSER; break; + case FLV_CODECID_PCM_MULAW: + acodec->sample_rate = 8000; + acodec->codec_id = CODEC_ID_PCM_MULAW; + break; + case FLV_CODECID_PCM_ALAW: + acodec->sample_rate = 8000; + acodec->codec_id = CODEC_ID_PCM_ALAW; + break; default: av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET; |