This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/7.0 in repository ffmpeg.
commit 9b6ffd74b5f3d338aa586164ac90ada916979af2 Author: James Almer <[email protected]> AuthorDate: Thu May 28 12:05:29 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Mon Jun 1 12:03:25 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]> (cherry picked from commit 95fe0658d7b3c2e5549ca9a41652ef8c613df8ec) --- libavformat/mov.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 1dd8bef4e4..31a806b5dc 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1178,15 +1178,13 @@ static int mov_read_chnl(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); flags = avio_rb24(pb); if (version != 0 || 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); - if (ret < 0) - return ret; + ff_mov_read_chnl(c->fc, pb, st); 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]
