From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5EF7E49394 for ; Thu, 8 Feb 2024 19:26:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B842E68D145; Thu, 8 Feb 2024 21:26:07 +0200 (EET) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26BD068CA4C for ; Thu, 8 Feb 2024 21:26:01 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 7A81CE9EFC for ; Thu, 8 Feb 2024 20:26:00 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 78D08L1i7m9F for ; Thu, 8 Feb 2024 20:25:56 +0100 (CET) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id BC953E9E79 for ; Thu, 8 Feb 2024 20:25:56 +0100 (CET) Date: Thu, 8 Feb 2024 20:25:56 +0100 (CET) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20240129232755.9622-1-cus@passwd.hu> Message-ID: <402776c9-1150-07c6-0b9b-79b55bcf1d82@passwd.hu> References: <20240129232755.9622-1-cus@passwd.hu> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 1/5] avformat/mov_chan: do not assume channels are in native order X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Tue, 30 Jan 2024, Marton Balint wrote: > Existing code could have caused wrong channel order signalling or reduced > channel count if a channel designation appeared multiple times. This is > actually an old bug, but the conversion to the new channel layout API made it > visible, because now the code overrides the proper channel count with the one > calculated from the mask. Will apply and backport patches 1 and 2. For the new API, I will wait a bit more. Regards, Marton > > Signed-off-by: Marton Balint > --- > libavformat/mov_chan.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c > index f3d51899e1..5cb2de3820 100644 > --- a/libavformat/mov_chan.c > +++ b/libavformat/mov_chan.c > @@ -530,7 +530,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, > size -= 20; > if (layout_tag == 0) { > uint64_t mask_incr = mov_get_channel_mask(label); > - if (mask_incr == 0) { > + if (mask_incr == 0 || mask_incr <= label_mask) { > label_mask = 0; > break; > } > -- > 2.35.3 > > _______________________________________________ > 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". > _______________________________________________ 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".