diff mbox series

[FFmpeg-devel] avformat/isom_tags: prefer in24 for 24bit PCM in MOV

Message ID 20210814172244.13760-1-jeebjp@gmail.com
State Accepted
Commit 087fbfe5bc2272aa1cfd9f4c49438436b68a1ddc
Headers show
Series [FFmpeg-devel] avformat/isom_tags: prefer in24 for 24bit PCM in MOV | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Jan Ekström Aug. 14, 2021, 5:22 p.m. UTC 
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.
---
 libavformat/isom_tags.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Paul B Mahol Aug. 14, 2021, 5:25 p.m. UTC | #1 
Patch is OK, apply at will.
diff mbox series

Patch

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') },