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 43BDD42CDE for ; Thu, 13 Jan 2022 02:00:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CDB568AFF7; Thu, 13 Jan 2022 03:52:56 +0200 (EET) Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1AED68AFF7 for ; Thu, 13 Jan 2022 03:52:49 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id f17so5323025qtf.8 for ; Wed, 12 Jan 2022 17:52:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=G4hNofkoadpYUaDiTmbUxycEExNXAjJ1OjMmQlU7WZQ=; b=p4s8UQgXGihhyrWSX13bWUcl2zv/KMufXo57lO3ESPPdBE3zSgzBDwVXmjFFKX0LGB 68limOPQ+RWzSpE5vqP41L2PJSklQbQtF/I9wdslMWsDOKTyaKdrYvaPdps1+wKQMeLo nbxGSsP8xS3nvevZadXcPwI9x3rrrLZ5ijiqKpy0vMOZ2JmdfKeYHC3Tqhu0nA+TXaUD WWy8VVqgKyztGveGpKV+hx/4xNVR1dHnooFlnUQwEXraoia6s90e5j6BvVomWhV0d1qG KFd+khuam1prkrcwWpYgVW27r+ccIxRCY4j/7lxQX7qoPYOXtD8IK+ISt4X67prpJydX DPcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G4hNofkoadpYUaDiTmbUxycEExNXAjJ1OjMmQlU7WZQ=; b=Qhdwyitg436kyjMse/Y6gmUfUn8Ca8AWGn1FaKSgTLDGJ43hB9EK/NJmqdX6yb9eDW OYbZmRMvHHHclZKvqmdYyMXskORRzYRuwROQIrhk7KbWhcHdhHVzVPuSnEM8AJHHbRc8 E6LJCma4ezALi+a6KLSuIU7sJH1DBeliqD37LyuiHl9OunrpoZ7VUmiKoRZrykxj1ZdM 2JGvOQrM+0q+o+KJplEGnps6X8UjWRC5hbXqln6k/pJHFilYYoHmQZNmTObVxvR4D+ay kmHKzQprGoG654HL6s3QD9Sy31SMyxsekkWpByatAWpHVeCyWutJsYLwu3rAwuiOTLd/ vgRA== X-Gm-Message-State: AOAM533V0h8MehyZ7dXpdAJRiWxSw8nzvY9snRtXqYdYpGKx7/TmCqrY eMG0pzgpJINlvh/egPUiCiDXNIMEYVY= X-Google-Smtp-Source: ABdhPJxScrPUC8nRy0gij6mqpIm2NiUbvQAtt9kgfiK3BWjpBghTIIJsplUd8keu+UIfyE4sU2mq3g== X-Received: by 2002:ac8:5c90:: with SMTP id r16mr1972186qta.599.1642038768251; Wed, 12 Jan 2022 17:52:48 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:02 -0300 Message-Id: <20220113015101.4-41-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 040/281] boa: 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: From: Anton Khirnov Signed-off-by: James Almer --- libavformat/boadec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/boadec.c b/libavformat/boadec.c index 536300a895..a5104bbed0 100644 --- a/libavformat/boadec.c +++ b/libavformat/boadec.c @@ -55,15 +55,17 @@ static int read_header(AVFormatContext *s) avio_rl32(s->pb); avio_rl32(s->pb); st->codecpar->sample_rate = avio_rl32(s->pb); - st->codecpar->channels = avio_rl32(s->pb); - if (st->codecpar->channels > FF_SANE_NB_CHANNELS || st->codecpar->channels <= 0) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb); + if (st->codecpar->ch_layout.nb_channels > FF_SANE_NB_CHANNELS || + st->codecpar->ch_layout.order <= 0) return AVERROR(ENOSYS); ffformatcontext(s)->data_offset = data_offset = avio_rl32(s->pb); avio_r8(s->pb); st->codecpar->block_align = avio_rl32(s->pb); if (st->codecpar->block_align > INT_MAX / FF_SANE_NB_CHANNELS || st->codecpar->block_align <= 0) return AVERROR_INVALIDDATA; - st->codecpar->block_align *= st->codecpar->channels; + st->codecpar->block_align *= st->codecpar->ch_layout.nb_channels; avio_seek(s->pb, data_offset, SEEK_SET); -- 2.34.1 _______________________________________________ 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".