From patchwork Thu Jan 13 02:02:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33471 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp38783iog; Wed, 12 Jan 2022 18:36:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuVV3MxVaMWJLwOPIrc7I1NShr47RnP8D4S7FWWsNWaXtO94nhTQ2O0iGFZ6dECVd4Xj3W X-Received: by 2002:a05:6402:f02:: with SMTP id i2mr2334821eda.97.1642041376775; Wed, 12 Jan 2022 18:36:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041376; cv=none; d=google.com; s=arc-20160816; b=nzerLFyiUjANRRbqWa/mKS1L6LRVqftBnzyQw/R/Q3yNtxsBfv/MqwXbPE9SVnccz5 JSXBoJhUDgM2u5qqqBKMlRiU5P7L3xAZFYESqxn7+CMPihDqLlmzGW8GKsmLl/mvuxsM 3BkQIGLVxMlhbMT2Tz8oM3ddcYNiABcYyNI9AXwEC1vu/BOCOSK07/Zw0lie23cL2Jcn RyjnbsMdDGP7+xsLnAFqV8boOcIr9eh2Jl2FGA3lwT5xMFU+qCl9zoHJB1T55f2Acm5G +hWYlpI6DqVRqjx0jsooeIdr9UcvCmaa93h9ZPNygM8LWPGNve8vzLvp4Ei0+vuNY+aa YdGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=a7uoNysJAiFcZPp3ufU2P33ainUyo/EQ6496urWbLsM=; b=LPNZLIVAe7cRYwY2TmAuydg8IBRgtCfPAZiGkD7z/6njUQsO+ogWm21T91/sLIoo/r 3TCRd9TESrblPx47UWqz80FxGiAeyEgf0D5IJAbAXRNIf1KpzFaI6sNJJuSXdx3JYwls ir353tCeMvOCdU3iSBa49irXPMWEZ71sFk5Vd85rQI9BNK9kuQrxMOJqpJ3a9jQR3xtp VQZap7O93iaKfI81fKnR4QpsqJBRqyBCFPzFJkMQ+XVZC8floe7nuSoSFZim+AlCPfS0 Jc60OIEWarQXXnfHFd+koQR3o36FwPswjzLxTVnlAldhOBEaIdgx6AOQAmdCFj8GqR/x GWZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WdJpD1r7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ne35si1000163ejc.748.2022.01.12.18.36.16; Wed, 12 Jan 2022 18:36:16 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WdJpD1r7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C540F68B73F; Thu, 13 Jan 2022 04:03:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4ABCC68B641 for ; Thu, 13 Jan 2022 04:03:19 +0200 (EET) Received: by mail-qt1-f171.google.com with SMTP id h15so978608qtx.0 for ; Wed, 12 Jan 2022 18:03:19 -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=UofZyb/w1ekyshe6r3TROxYYq7XL1wGEP2Imu/trgJY=; b=WdJpD1r7yR9Ut+MW2KG0wmyTN6h2+gOl1m8r9auZESvMfPV+mDuvuHr+LP6DdF7rot XDX4pmc/WB7hpPJ8oZCvURfgzCy//x0tn/E75/JIKSIjgCDxVATIhNEqIpKfR5eGCy/J 3oMFJ0/vHOgG8ulgfLFeqBEeeSnX/vnlFnAp8D8Hc/58zYT1jvQO09zRUR0kxEQqXPaO jW/eCcOkDoGiRhmZgiK07X2eGz+UcPief+IjoLT/gdJ8lWRvtd5MSlp38UqUDlcYHugW FCAiTqqI+vULK4FxvlN4H6NtZBGR7L7TI4LQDA/KJEEcAQ4iKnVtSPB4GKxZTB33KQIa 3ARw== 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=UofZyb/w1ekyshe6r3TROxYYq7XL1wGEP2Imu/trgJY=; b=MIOpiWIwxtBVoT8py44tNtLAdyozS4k7OLvWR4FTXq+Q3KzpZpLWih4vVOCFkfk6LL T3+fbK98A65ZFXDH9uxL+S08sAeyW5qglsq403LvO5vLve7c40x47/LgJ6wZa1+tpuC2 ey3JNuRC3xIxTpKpIztYxu9196B4pGcRoQEGXsw5XWoeqq3NH6vntXBycvuovMe4i81I CbvaZ6oEkfvCiPCPDWxV6XpxSzoLFzX4X4ICeNmRTmMCOfdBL4PUenwVM2QHioS6KV/n J/6E+YQAQ5rll+zzPLZ0o+/FO4a1owuWZjE/JdWO5JTZGvW0K+Wfn5ZrcS8qsWSzW/dn yXJw== X-Gm-Message-State: AOAM533iDV4XPVApUY38pyPBdAoSkYxUd0a3AqILq68hgsqJSFc1hFh0 jMN6yn98jL77JgXIq6abqUY2+NpYaAs= X-Received: by 2002:a05:622a:138a:: with SMTP id o10mr2061751qtk.211.1642039397849; Wed, 12 Jan 2022 18:03:17 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id v1sm1045961qtc.95.2022.01.12.18.03.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:03:17 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:02:30 -0300 Message-Id: <20220113020242.661-18-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 197/281] bmvaudio: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: D9a9a93qHxRA From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/bmvaudio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/bmvaudio.c b/libavcodec/bmvaudio.c index a7eae46103..d81dba8821 100644 --- a/libavcodec/bmvaudio.c +++ b/libavcodec/bmvaudio.c @@ -31,8 +31,8 @@ static const int bmv_aud_mults[16] = { static av_cold int bmv_aud_decode_init(AVCodecContext *avctx) { - avctx->channels = 2; - avctx->channel_layout = AV_CH_LAYOUT_STEREO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; avctx->sample_fmt = AV_SAMPLE_FMT_S16; return 0;