This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit d4125bbce70f21fc5606f8e2a01c86602295b4da Author: Tim Walker <[email protected]> AuthorDate: Sat May 23 17:02:32 2026 +0200 Commit: James Almer <[email protected]> CommitDate: Thu May 28 03:22:29 2026 +0000 avformat/movenc: add channel layout mappings for a few codecs These codecs cannot self-report layout in the bitstream, and are known or expected to use a libavutil-compatible channel order, and as such can use mov_ch_layouts_wav for tag lookup. --- libavformat/mov_chan.c | 6 ++++++ tests/ref/lavf-fate/qtrle_mace6.mov | 2 +- tests/ref/lavf/mov | 6 +++--- tests/ref/lavf/mov_hybrid_frag | 2 +- tests/ref/lavf/mov_rtphint | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index befe6ebc86..f5af5e122f 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -349,6 +349,12 @@ static const struct { { 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_ADPCM_IMA_QT, mov_ch_layouts_wav }, + { AV_CODEC_ID_MACE3, mov_ch_layouts_wav }, + { AV_CODEC_ID_MACE6, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_ALAW, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_MULAW, mov_ch_layouts_wav }, + { AV_CODEC_ID_SPEEX, mov_ch_layouts_wav }, { AV_CODEC_ID_NONE, NULL }, }; diff --git a/tests/ref/lavf-fate/qtrle_mace6.mov b/tests/ref/lavf-fate/qtrle_mace6.mov index 85c585fe39..b46f06b93e 100644 --- a/tests/ref/lavf-fate/qtrle_mace6.mov +++ b/tests/ref/lavf-fate/qtrle_mace6.mov @@ -1,3 +1,3 @@ -f0ae34fb90e11342624e092094273aef *tests/data/lavf-fate/lavf.qtrle_mace6.mov +c8f3191bed57ca30ec2cf804f27158cd *tests/data/lavf-fate/lavf.qtrle_mace6.mov 1270415 tests/data/lavf-fate/lavf.qtrle_mace6.mov tests/data/lavf-fate/lavf.qtrle_mace6.mov CRC=0x9320cd26 diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 7e6a91f171..1c640e599d 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,9 +1,9 @@ -0714e32691dcf6b80c33fdfb81919c12 *tests/data/lavf/lavf.mov +c46b2da22e2d198d2d4da499f97dab22 *tests/data/lavf/lavf.mov 357371 tests/data/lavf/lavf.mov tests/data/lavf/lavf.mov CRC=0xbb2b949b -115919b9f9c15f6631d30a827ef10c9e *tests/data/lavf/lavf.mov +0e6c2ed974e017ac0b7f617d5d468113 *tests/data/lavf/lavf.mov 366405 tests/data/lavf/lavf.mov tests/data/lavf/lavf.mov CRC=0xc75fc595 -76729644f95883101d2134d117c1126a *tests/data/lavf/lavf.mov +33b82f56a7e48e1c105f3058110f39e0 *tests/data/lavf/lavf.mov 356753 tests/data/lavf/lavf.mov tests/data/lavf/lavf.mov CRC=0xbb2b949b diff --git a/tests/ref/lavf/mov_hybrid_frag b/tests/ref/lavf/mov_hybrid_frag index 13cad9505a..27bc7e3546 100644 --- a/tests/ref/lavf/mov_hybrid_frag +++ b/tests/ref/lavf/mov_hybrid_frag @@ -1,3 +1,3 @@ -b79a7ecf125aef1f97c8e9b7df7066a0 *tests/data/lavf/lavf.mov_hybrid_frag +c08e73a079bac4df1e1e1eb4955db094 *tests/data/lavf/lavf.mov_hybrid_frag 358464 tests/data/lavf/lavf.mov_hybrid_frag tests/data/lavf/lavf.mov_hybrid_frag CRC=0xbb2b949b diff --git a/tests/ref/lavf/mov_rtphint b/tests/ref/lavf/mov_rtphint index b4256a861b..6bb4c0cac8 100644 --- a/tests/ref/lavf/mov_rtphint +++ b/tests/ref/lavf/mov_rtphint @@ -1,3 +1,3 @@ -e5e994cd3885a28304229f5e277c1917 *tests/data/lavf/lavf.mov_rtphint +2bbead9d2dffda3e273ec6b07acbeeb5 *tests/data/lavf/lavf.mov_rtphint 365761 tests/data/lavf/lavf.mov_rtphint tests/data/lavf/lavf.mov_rtphint CRC=0xbb2b949b _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
