diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-28 23:57:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-28 23:57:31 +0200 |
| commit | 4453f6b8613b0803246c1a9160c8270ec9de1237 (patch) | |
| tree | 3a641fda838ccb4130bbf5e2d1d29c8bbcc69fa4 /libavformat/flvdec.c | |
| parent | 7877b50d181be1e044eb8b57f203c763297651b1 (diff) | |
| parent | b92c7ee662b618518bff366af3274784fb141dde (diff) | |
| download | ffmpeg-4453f6b8613b0803246c1a9160c8270ec9de1237.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flv: add support for G.711
doc: git: Add checklist with test steps to perform before pushing
flvenc: K&R formatting cosmetics
movenc: Add channel layouts for PCM.
Conflicts:
libavformat/flvenc.c
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 31f306872f..c5e4582913 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; |