From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 1EE4C4251D
for <ffmpegdev@gitmailbox.com>; Fri, 18 Mar 2022 01:08:08 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7DCB68B098;
Fri, 18 Mar 2022 03:08:05 +0200 (EET)
Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com
[209.85.167.178])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8AD968A5B3
for <ffmpeg-devel@ffmpeg.org>; Fri, 18 Mar 2022 03:07:59 +0200 (EET)
Received: by mail-oi1-f178.google.com with SMTP id o83so7488876oif.0
for <ffmpeg-devel@ffmpeg.org>; Thu, 17 Mar 2022 18:07:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=from:to:subject:date:message-id:mime-version
:content-transfer-encoding;
bh=QxKqyyusM8bE4Z7IsNYaKVSyBj4LOoki3Zbk3yzcfiQ=;
b=a+KLvbsSpSTsg1V/Lro/gi/e93PKKpWXu0fQdew8d3mX7krPCK6973KTzfbL5C41Ai
I6/DQ5J5elK8RPges2mECHggIE0yFeBgO7LB4DJqGGyV73pph4w4yCb/UPj6QepfLP4D
NBqIFj/SOL+kK8Lr1ZOcmMndXbZ+cBU+7PNNM5YdCfF5L+QKqZ/Mij/EqRZaT8fXAUrZ
RvdD9wcXVlCThZ4fbliod8+L8NozaXwMG0Oj0cwRQ4jfadLwSndJLR2/zChFJUQ3E31X
3Odj1C8UEvvU1+AFvrExMl/wSLPXp2GEyldYwL1wK6Gno00Cir6nUwCzlf1uKSgAl9Tb
njLA==
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:mime-version
:content-transfer-encoding;
bh=QxKqyyusM8bE4Z7IsNYaKVSyBj4LOoki3Zbk3yzcfiQ=;
b=lXHfInPj4FR6Xg+Nv/vGJBYm+0WI/CZid53RxZfqCyHxS5x+esow/VONSUjubGO3ps
yItGk8n4hcEJ6f6NPj3tmtFhQ0VYEkBQidqFgLfkGi6lsTzIrwnWgPfRZxj08if0p9+v
/aGlwwhICdFlwJGv5FFijkao+Pqay90uORTGX6psh2FuOsqKCwZgHcuqFvJNRfzNbExy
fibAqJGwok22Hy2kID+0w+F6rSGvTK8GsaUsNYpyhKXyB5qnfSSa1FmhDCoiHg/G3k6f
rORRIFfsGhJiY5XHRU7DZaPfcgBa2FrkamAKDzSr9DGlgvCpM6tc2/FMy8/EvcEAEGPw
qo5w==
X-Gm-Message-State: AOAM533S4cytwcAA67efho3zIPfETFDUXE2fXXPXaMRQbycQlw20bDdg
x2RfXBvLH7X7UClHh34RVGKcBxyYLjP2Fg==
X-Google-Smtp-Source: ABdhPJywtSX+l2k4hAv/cR9uHUelom0r/4HgVJoOmNiMCUgTDo7RHVGV0c+3RBHH1k768AA2S2Cj0w==
X-Received: by 2002:aca:2110:0:b0:2ec:b1cf:2dda with SMTP id
16-20020aca2110000000b002ecb1cf2ddamr7196950oiz.143.1647565678001;
Thu, 17 Mar 2022 18:07:58 -0700 (PDT)
Received: from localhost.localdomain ([186.136.131.95])
by smtp.gmail.com with ESMTPSA id
l12-20020a056808020c00b002da28c240dfsm3176275oie.16.2022.03.17.18.07.56
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 17 Mar 2022 18:07:57 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 17 Mar 2022 22:07:29 -0300
Message-Id: <20220318010729.12418-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.35.1
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] avcodec/wmaprodec: ensure channel count in
the private context and decoder context are consistent
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20220318010729.12418-1-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
avctx->ch_layout will be reinitialized using channel_mask later in the
function.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/wmaprodec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 5c1d38eca5..6a8b895c1b 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -402,7 +402,7 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu
s->decode_flags = AV_RL16(edata_ptr+14);
channel_mask = AV_RL32(edata_ptr+2);
s->bits_per_sample = AV_RL16(edata_ptr);
- s->nb_channels = avctx->ch_layout.nb_channels;
+ s->nb_channels = channel_mask ? av_popcount(channel_mask) : avctx->ch_layout.nb_channels;
if (s->bits_per_sample > 32 || s->bits_per_sample < 1) {
avpriv_request_sample(avctx, "bits per sample is %d", s->bits_per_sample);
--
2.35.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".