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 F2994405C7 for ; Wed, 26 Jan 2022 13:41:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8BDC68AF8B; Wed, 26 Jan 2022 15:41:17 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA6EA68AE13 for ; Wed, 26 Jan 2022 15:41:10 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5750024017C for ; Wed, 26 Jan 2022 14:41:10 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Lo3yukAkDcHo for ; Wed, 26 Jan 2022 14:41:09 +0100 (CET) Received: from lain.red.khirnov.net (lain.red.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.red.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 38385240179 for ; Wed, 26 Jan 2022 14:41:09 +0100 (CET) Received: by lain.red.khirnov.net (Postfix, from userid 1000) id 327C016008E; Wed, 26 Jan 2022 14:41:09 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220113015101.4-28-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> <20220113015101.4-28-jamrial@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Wed, 26 Jan 2022 14:41:09 +0100 Message-ID: <164320446910.23111.8385106993484257915@lain.red.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 027/281] apc: convert to new channel layout API 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting James Almer (2022-01-13 02:49:49) > From: Vittorio Giovara > > Signed-off-by: Vittorio Giovara > Signed-off-by: James Almer > --- > libavformat/apc.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/libavformat/apc.c b/libavformat/apc.c > index 56151bb59a..192e115278 100644 > --- a/libavformat/apc.c > +++ b/libavformat/apc.c > @@ -38,6 +38,7 @@ static int apc_read_header(AVFormatContext *s) > AVIOContext *pb = s->pb; > AVStream *st; > int ret; > + int channels; > > avio_rl32(pb); /* CRYO */ > avio_rl32(pb); /* _APC */ > @@ -57,16 +58,11 @@ static int apc_read_header(AVFormatContext *s) > if ((ret = ff_get_extradata(s, st->codecpar, pb, 2 * 4)) < 0) > return ret; > > - if (avio_rl32(pb)) { > - st->codecpar->channels = 2; > - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; > - } else { > - st->codecpar->channels = 1; > - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; > - } > + channels = avio_rl32(pb) + 1; This changes behavior in case the value read is > 1. No idea if that ever happens, but still better make it !!avio_rl32. -- Anton Khirnov _______________________________________________ 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".