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/mov_chan.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/mov_chan.c')
| -rw-r--r-- | libavformat/mov_chan.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index a843e318c4..edd5f6c4da 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -414,6 +414,20 @@ static const enum MovChannelLayoutTag mov_ch_layouts_alac[] = { 0, }; +static const enum MovChannelLayoutTag mov_ch_layouts_wav[] = { + MOV_CH_LAYOUT_MONO, + MOV_CH_LAYOUT_STEREO, + MOV_CH_LAYOUT_MATRIXSTEREO, + MOV_CH_LAYOUT_MPEG_3_0_A, + MOV_CH_LAYOUT_QUADRAPHONIC, + MOV_CH_LAYOUT_MPEG_5_0_A, + MOV_CH_LAYOUT_MPEG_5_1_A, + MOV_CH_LAYOUT_MPEG_6_1_A, + MOV_CH_LAYOUT_MPEG_7_1_A, + MOV_CH_LAYOUT_MPEG_7_1_C, + MOV_CH_LAYOUT_SMPTE_DTV, +}; + static const struct { enum CodecID codec_id; const enum MovChannelLayoutTag *layouts; @@ -421,6 +435,18 @@ static const struct { { CODEC_ID_AAC, mov_ch_layouts_aac }, { CODEC_ID_AC3, mov_ch_layouts_ac3 }, { CODEC_ID_ALAC, mov_ch_layouts_alac }, + { CODEC_ID_PCM_U8, mov_ch_layouts_wav }, + { CODEC_ID_PCM_S8, mov_ch_layouts_wav }, + { CODEC_ID_PCM_S16LE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_S16BE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_S24LE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_S24BE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_S32LE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_S32BE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_F32LE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_F32BE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_F64LE, mov_ch_layouts_wav }, + { CODEC_ID_PCM_F64BE, mov_ch_layouts_wav }, { CODEC_ID_NONE, NULL }, }; |