From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: 苏童 <220235212@seu.edu.cn>
Subject: [FFmpeg-devel] [PATCH] avformat/iamfdec: Check side_substream_id before use
Date: Wed, 23 Apr 2025 01:45:20 +0200
Message-ID: <20250422234520.807983-1-michael@niedermayer.cc> (raw)
Fixes: poc-iamf-2025-04
Found-by: 苏童 <220235212@seu.edu.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/iamfdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c
index 0f273bdd438..3a6276dcdea 100644
--- a/libavformat/iamfdec.c
+++ b/libavformat/iamfdec.c
@@ -126,7 +126,7 @@ static int iamf_read_header(AVFormatContext *s)
// Swap back and side stream ids as our native channel layout ordering doen't match the
// order from ITU-R - BS.2051-3 for Systems I and J (where side channels come before back ones).
- if (back_substream_id >= 0 && av_channel_layout_compare(&layer->ch_layout,
+ if (back_substream_id >= 0 && side_substream_id >= 0 && av_channel_layout_compare(&layer->ch_layout,
&(AVChannelLayout)AV_CHANNEL_LAYOUT_9POINT1POINT6)) {
const IAMFSubStream *back_substream = &audio_element->substreams[back_substream_id];
const IAMFSubStream *side_substream = &audio_element->substreams[side_substream_id];
--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2025-04-22 23:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-22 23:45 Michael Niedermayer [this message]
2025-05-12 22:27 ` Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250422234520.807983-1-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=220235212@seu.edu.cn \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git