This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 95fe0658d7b3c2e5549ca9a41652ef8c613df8ec Author: James Almer <[email protected]> AuthorDate: Thu May 28 12:05:29 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Mon Jun 1 09:53:54 2026 -0300 avformat/mov: don't abort on unsupported or invalid chnl boxes They are optional and just define a channel layout, which may also be defined by the underlying codec. Signed-off-by: James Almer <[email protected]> --- libavformat/mov.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5f8be009c4..8eb67aaadf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1238,15 +1238,17 @@ static int mov_read_chnl(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); flags = avio_rb24(pb); if (version > 1 || flags != 0) { - av_log(c->fc, AV_LOG_ERROR, - "Unsupported 'chnl' box with version %d, flags: %#x", + av_log(c->fc, AV_LOG_WARNING, + "Unsupported 'chnl' box with version %d, flags: %#x\n", version, flags); - return AVERROR_INVALIDDATA; + return 0; } ret = ff_mov_read_chnl(c->fc, pb, st, version); - if (ret < 0) - return ret; + if (ret < 0) { + avio_seek(pb, end, SEEK_SET); + return 0; + } if (avio_tell(pb) != end) { av_log(c->fc, AV_LOG_WARNING, "skip %" PRId64 " bytes of unknown data inside chnl\n", _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
