[FFmpeg-cvslog] avformat/iamf_parser: remove unreachable code

James Almer git at videolan.org
Thu Jun 26 22:34:12 EEST 2025


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Jun 26 16:32:40 2025 -0300| [1abc25cd2365d4ede0ab085cf69a91d5549e3e5b] | committer: James Almer

avformat/iamf_parser: remove unreachable code

expanded_loudspeaker_layout is only present and read on the first layer.

Fixes Coverity issue #1655173.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1abc25cd2365d4ede0ab085cf69a91d5549e3e5b
---

 libavformat/iamf_parse.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index 73e98200e3..2fc2841c58 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -397,8 +397,6 @@ static int scalable_channel_layout_config(void *s, AVIOContext *pb,
             expanded_loudspeaker_layout = avio_r8(pb);
         if (expanded_loudspeaker_layout > 0 && expanded_loudspeaker_layout < 13) {
             av_channel_layout_copy(&ch_layout, &ff_iamf_expanded_scalable_ch_layouts[expanded_loudspeaker_layout]);
-            if (i)
-                ch_layout.u.mask &= ~av_channel_layout_subset(&audio_element->element->layers[i-1]->ch_layout, UINT64_MAX);
         } else if (loudspeaker_layout < 10) {
             av_channel_layout_copy(&ch_layout, &ff_iamf_scalable_ch_layouts[loudspeaker_layout]);
             if (i)



More information about the ffmpeg-cvslog mailing list