From patchwork Thu Jan 13 01:49:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33316 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14922iog; Wed, 12 Jan 2022 17:57:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJygobIodSMmoUrLYLeyCH+BvkLLxi26P5jg+Esojm9E2Ldjiie07cCeXLQBHkbE+Et2lHc/ X-Received: by 2002:a05:6402:440a:: with SMTP id y10mr2145367eda.371.1642039031499; Wed, 12 Jan 2022 17:57:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039031; cv=none; d=google.com; s=arc-20160816; b=JF8W5ZLsVQdDp0rNiVzDamyeppYxea/Y5P/vb5e2R2mZXjO7NUM/TBqF3G81Bn5LIJ iNb/kqjDe8z7Y40RCFzwgRXLDRCsZG9v2MXsjq3POvvIywkyJDkin9pOcgdklKGy0g/I 3hj1nJJn0GH3SLxR1EV+3qrebrA4Bsqa6ip0Xbb2mhZg8ekhZuriItiWCxBA/irG78Ec BPc0DrD0pBUllIzYOY8OPzbMd3EBnh/3mvSPb8iJiwujN982/S7L7jjP18oRxLymLhAT h8J7Nj5Gb5OkSJBRjSMl5d5bk9j1Supx+Qkz4o/eRbOCWXXYAa15eGHHJ0jj2YwCvfbc GFwg== 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=EqTZo3GQ9gPxB8Jk/ninVRB610LVfC3gYrD/qh0VdCo=; b=npbRY75FNOoQswD6FJQ1dj6s4LtzbIiP+mZjwAmMIBVJMvgpbLTBXHxVngaHZs08wh gOOokvkDqd9rjH2o/AruCem4yl1YuxAMUdugSmmuMo2igJ1K5wbBKebFj+lImnVD/eBz CoPvu+Wq8WAXnxJOI6OiX7P+BO6EOkpIIYlUBpRskdo4Kf+RC/OisxqkY/ltNi7vQeqm L93YDyAj2P8HNR4fXXtz0IQIzoVqKuOXn6c4/uBgMSds5r/G98yQjGbLNCT3eqVhNJ/1 WXvLtEBBQEnRd9uYZ2dopJMaWeyOiYkbeQkKtZ/QdCs49Ws8YNDMxJkWa02znX4Tj1hY H0Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BBTPJLTo; 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 s17si759616ejz.77.2022.01.12.17.57.11; Wed, 12 Jan 2022 17:57:11 -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=BBTPJLTo; 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 5E9DE68AFFF; Thu, 13 Jan 2022 03:52:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A63968B007 for ; Thu, 13 Jan 2022 03:52:32 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id y10so5359859qtw.1 for ; Wed, 12 Jan 2022 17:52:32 -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=ppQ5lpe2Ytw80mDJGjA2kWsUSQEwTHIg3sPns6pI5E8=; b=BBTPJLTo/GgzTc+avcb6LS8N4rVPZeaI0zvexJ+Gfp9KR9MDC02ABeNldH5i1coaaJ wgj0aAlflUh+vOi7gld1BDtLvnaPmOTOgmjooJK8MoSq4DB696ybxosIjwT4m5wHJdD3 5J/rkMvDUPvXKWbwz3IrY1pFZAu5Eo7jCsrPvl3uHH4UifX12kl8stheuUfIXwfeiJLh fO6pNK1dOd1sDTx+LBBQwyYYVQTq9a5A/NiQ4c0OOKDcYqJM9UbWDiHd5MrOFhJusgXD qLY+P15kT8D4SK4wS/QtCXy8C5ibc57WwgKsSQ+7w3unJv8Um3VsHL482Q+b3F3jhYG8 mi/Q== 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=ppQ5lpe2Ytw80mDJGjA2kWsUSQEwTHIg3sPns6pI5E8=; b=j3BrNtW3B9q8BdJB7IybztgEIxU2vlvipDBNw21eY3ogsoSqF8HjHdFDM2vUxg/6IU c62CgoShMTQnE4oF+DroNS0/uDzp+pEVNMo0LX3YvRQKufY7dhMf8i5yiX5Cn5SoBifl IufxY9801c+upqNhIApu/zTnYNdoRrZih5XZyUJiGpKzxA7doMepAmXQTcz3W+0jSfKR WMQj457bmtf++UsayY39DtW1WD/f9KXPXi+MROBmTyLN4osB+vPhYr0lAhn6ycWvKmZK z0cFMl2DubY5vCKcrN5pyqIyUFrIkAJcmY2EO0tWuf9mbRa7TBdE4Q9udx5rCVDRu3f3 01tQ== X-Gm-Message-State: AOAM533tJl07uvE8bAlaJ6eRPWKVa3ePhIGGf24TkeHr4JVrWIGwfcW8 rRh/LATsYmASIJoErWUK4gI7KwIl4wU= X-Received: by 2002:a05:622a:612:: with SMTP id z18mr2006805qta.442.1642038751333; Wed, 12 Jan 2022 17:52:31 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:30 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:48 -0300 Message-Id: <20220113015101.4-27-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 026/281] amv: 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: a/nFSMyoqJ7E Signed-off-by: James Almer --- libavformat/amvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/amvenc.c b/libavformat/amvenc.c index fece2f49b1..28d4879b19 100644 --- a/libavformat/amvenc.c +++ b/libavformat/amvenc.c @@ -244,9 +244,9 @@ static void amv_write_alist(AVFormatContext *s, AVCodecParameters *par) /* Bodge an (incorrect) WAVEFORMATEX (+2 pad bytes) */ tag_str = ff_start_tag(pb, "strf"); AV_WL16(buf + 0, 1); - AV_WL16(buf + 2, par->channels); + AV_WL16(buf + 2, par->ch_layout.nb_channels); AV_WL32(buf + 4, par->sample_rate); - AV_WL32(buf + 8, par->sample_rate * par->channels * 2); + AV_WL32(buf + 8, par->sample_rate * par->ch_layout.nb_channels * 2); AV_WL16(buf + 12, 2); AV_WL16(buf + 14, 16); AV_WL16(buf + 16, 0);