diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2021-08-14 20:14:37 +0300 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2021-08-14 20:19:51 +0300 |
| commit | 087fbfe5bc2272aa1cfd9f4c49438436b68a1ddc (patch) | |
| tree | 5275f88520afb1cf6d766f8d1331bbf93941ec8c /libavformat | |
| parent | acd3c101ef4b84aac9c608bfe6ab22431529c48f (diff) | |
avformat/isom_tags: prefer in24 for 24bit PCM in MOV
In 1c42fd93236e7869ef4d9fe3650dd3e951387321 the ipcm identifier was
added in order to demux additional raw audio from Sony MP4 files.
Unfortunately, it was not noticed that this same list is utilized
for muxing as well, thus causing ipcm to get preferred compared
to the identifier officially specified in QTFF documentation.
This fixes the order of preference for 24bit PCM, where ipcm is
still allowed, but in24 is the first match - thus being preferred.
Fixes fate-acodec-pcm-s24be.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom_tags.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index e2e589b658..d0400b18fc 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -312,10 +312,10 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { AV_CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, { AV_CODEC_ID_PCM_S16BE, MKTAG('l', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, - { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'p', 'c', 'm') }, - { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') }, + { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') }, { AV_CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') }, { AV_CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') }, |