From patchwork Thu Jan 13 02:00:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33441 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp34540iog; Wed, 12 Jan 2022 18:28:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyKQ7kTzLITE1lFuEungVSAS4NZoRxSGqSM1oNk7kqnB0PYu0TZpacjf7Jhd78NFfrfievW X-Received: by 2002:a17:907:724c:: with SMTP id ds12mr1881844ejc.687.1642040905650; Wed, 12 Jan 2022 18:28:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040905; cv=none; d=google.com; s=arc-20160816; b=ZYGN8hH4lb5bJU75D7xfx5V2Q57yl/umwVp9PjLU65q4e9pmBfwqBZeUNbK124ik3X dF5LGaikSwWWBtDjj8bjy70e2D6F8UeeK2ZE2xu4mcYctZ+9QHIsHW4zN4Qt3KbyW6bS wmaDNCfSrfLkNMDdRZ4Aem9+Q4ywNKigw11xUZ6f07IISpyqqlb8vxbuc6hozUz/PHSf Io96Flt20r4Hat75jdx5uE4EgJ+6OukH1iXjY9zSGtDspCbl1B1Al9ShxrFXtrXRvDkV BQmTNrml/PuVzIz1OT95QTadl0Y0/yr6gHPD8pdf+yLMtJuo+ZrE7at2C41lXNjRw64R XHPg== 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=hdSSu+lwj8gcaJtxOwJpQyE75QSo1j5A6qiU3r1VR0I=; b=ZN9PlFUW4PjvXx6MYUeGQRzHHhqUtxLwi8Uedn97soCoHZQ5vsIdKdQ6KM4ebUCaXL AQQ9lCBiTllmRtJGQW7dWkUVtDgO2KOcFbFOEzZNF+EPZN6azrrR7uGCI/QG8i0ity9F zQKiH04mxK5Knb55Rce10A6wT41A+pZX2mCWYN5AfO9+rWhyZi6ORUc7/gNKsSCwW8lz fWGcxLldjLS8OXhUeZnL3H8GpRe+0/SC+3nDibT0M5gBIAnp1KWBC/fkf6gWAZOxOV7E GsTSDNAVH8VU/0whj1I9tkErIW7iSUBPKQLyiq361HCgp/oGPOh/BmiCdFCwBP15Hj9f NAIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=k6UIb2i5; 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 e4si942115ejs.48.2022.01.12.18.28.25; Wed, 12 Jan 2022 18:28:25 -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=k6UIb2i5; 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 ECBFE68B4D5; Thu, 13 Jan 2022 04:01:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CFDA68B4B5 for ; Thu, 13 Jan 2022 04:01:22 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id p12so5099913qvj.6 for ; Wed, 12 Jan 2022 18:01:22 -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=UbBMYixZzyImY/mSEGFZPpkx95P86OThIWOsMy+wZxw=; b=k6UIb2i5p3RxBUJ5tkRMg4C3vGB8VwHfArT5kqfo3FgwZM/p18GUliPxVjwxdmQGiJ lBaV3M2ytyyHI9NVoGj+VyUC9edzTpaKzND0sbchA9MvbMTCEChVyOs2zD/8bPGBfTKy eDfPIfTL9cxuVqEsnutZN7kHJSrEurUkmBCAk4IcqhRWoDlaXVwqq1cA3pDBI89mxNBM a1rNcZI+PX0orJ+m9l4N8im/oZnLSGMGTNjE5PB0fqlcnh/h6sb516tF1BWBot+6WKLE hA5fvEGSMpfihAYVBLf9lk1+NE10oeE2jFEM3MB7cJ3UrOjvg2t3DRbw0dCRfGYJ9+Ay HZLg== 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=UbBMYixZzyImY/mSEGFZPpkx95P86OThIWOsMy+wZxw=; b=xGWwcvb7A+smxP0piVUJDKRlYGXbbxnP189W65ec0eZH1oczMvqQxNIt0FI0bK8OvA fJe+p9/IMWgLggofG8CGRsZvqlss1B+Q//vvn3gOScHzyrzzOAWSLuEmImeOukRyDubJ fPTSIYNjDIC34pcNcw5Vtg1CU5pIyLSQSchSXKd5dEWaPNpBOnJFbueKj4zsigrXm3Eo QZ4chgo5LHH6YSP/9l3dIzQumw1rOuj/8taUgQWnOr0QN239/bvTOLu9WAJh6M/BIU4r QZIoIGscyRBFgcza1546Ht7orEHL8wl3oOnw8C9wuarNZHaxcyeXE9SXBYBFEE8XDTiI JmJA== X-Gm-Message-State: AOAM531MZGREi57ZQjUdswR1UzLB2JdiG6jQrJvgsXmg2As2R0OMGLCK OMqcMpeqva3GivqF7usZt5y+P68jhNw= X-Received: by 2002:a05:6214:1c45:: with SMTP id if5mr2378381qvb.100.1642039280725; Wed, 12 Jan 2022 18:01:20 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:20 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:10 -0300 Message-Id: <20220113020026.590-15-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 163/281] vivo: 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: aXpfmC8WhfT8 From: Anton Khirnov Signed-off-by: James Almer --- libavformat/vivo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/vivo.c b/libavformat/vivo.c index 2a08e1df03..114eb212e5 100644 --- a/libavformat/vivo.c +++ b/libavformat/vivo.c @@ -249,7 +249,8 @@ static int vivo_read_header(AVFormatContext *s) ast->start_time = 0; ast->codecpar->codec_tag = 0; ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codecpar->channels = 1; + ast->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + ast->codecpar->ch_layout.nb_channels = 1; return 0; }