diff options
Diffstat (limited to 'libavformat/mov_chan.c')
| -rw-r--r-- | libavformat/mov_chan.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 3d02aff036..475a66ba82 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -429,25 +429,25 @@ static const enum MovChannelLayoutTag mov_ch_layouts_wav[] = { }; static const struct { - enum CodecID codec_id; + enum AVCodecID codec_id; const enum MovChannelLayoutTag *layouts; } mov_codec_ch_layouts[] = { - { 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 }, + { AV_CODEC_ID_AAC, mov_ch_layouts_aac }, + { AV_CODEC_ID_AC3, mov_ch_layouts_ac3 }, + { AV_CODEC_ID_ALAC, mov_ch_layouts_alac }, + { AV_CODEC_ID_PCM_U8, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S8, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S16LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S16BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S24LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S24BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S32LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S32BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_F32LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_F32BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_F64LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_F64BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_NONE, NULL }, }; uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap) @@ -490,7 +490,7 @@ static uint32_t mov_get_channel_label(uint32_t label) return 0; } -uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id, +uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id, uint64_t channel_layout, uint32_t *bitmap) { @@ -499,11 +499,11 @@ uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id, const enum MovChannelLayoutTag *layouts = NULL; /* find the layout list for the specified codec */ - for (i = 0; mov_codec_ch_layouts[i].codec_id != CODEC_ID_NONE; i++) { + for (i = 0; mov_codec_ch_layouts[i].codec_id != AV_CODEC_ID_NONE; i++) { if (mov_codec_ch_layouts[i].codec_id == codec_id) break; } - if (mov_codec_ch_layouts[i].codec_id != CODEC_ID_NONE) + if (mov_codec_ch_layouts[i].codec_id != AV_CODEC_ID_NONE) layouts = mov_codec_ch_layouts[i].layouts; if (layouts) { |