From patchwork Thu Jan 13 01:50: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: 33332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp17834iog; Wed, 12 Jan 2022 18:01:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUGk+bJgBDuUtZpmPRw2AMO4xC/mfG+ZflcL61ed9mr8XwsVrTV25TODxttr+eYoLAQ9I2 X-Received: by 2002:a17:906:e08:: with SMTP id l8mr119453eji.344.1642039313752; Wed, 12 Jan 2022 18:01:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039313; cv=none; d=google.com; s=arc-20160816; b=ktWp1BcnYa5GmBf6cZod+3RME4l20T3f2ARpWOqMJ+W8k2bRO0Fcyb6Yix6RXe5CS/ hRY76XS8k6RcrHwfHDIdXHi2XSfCoE4dUEMv78E20CqL5j8A/6CVadgAzDCN1IBGIJ/k 0r9r0/FEMdbn7M2U4s/Hyt+GagiFZzDRJzBTMboJL0kyXh2zuwdXn1eA1wZbBmPoImv5 z2y9tBnxmWnUeeiImvbq1fw5NZya8W4+HrE9Ml1tiNYnar7I0ZuEjZsGBwkGVMVKb3st EinFGlHWJDCExoiZH5F8djlZFEiPXEDUl/YPi3BQ2ahutyFRzkDBPDbLL+EKykjGOhMI qDvQ== 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=tRPR/82VFVyIZK1FFDkCkjeVyBDLqtmnsvjafWDstEs=; b=KA/WrHJ5SvGS75Ro84NH5SWM3i4cwDfSjRELH2X5Nr3lMflpAcb3ptNU8VNv47shon iS6ye3lFDCksgYqdboiM5teJwIaZn1NoWgX8wV0i6F8SCa1xz0WbUmF0JSt58fRVfrMc mVFFyHSVByEO3fjFYj1Ndf8e7zf/PqdFG2z0zKUXz+X7Gm0cJBDVd+NvJ84R6K1VLd3e RmxJl6nGHEeSTP5a2bq90d0nwjKw1Pt103VC1mIiGUqV/wn8GCd4yUItweppDz6diSLq Ej+AaVOapuoPfMmm8UXUSrpuv5NftzpKeQkBasIsOiWZYtNvL/E5iG/qCXuQkBZIoswW h6PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KxB3ncum; 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 hv15si767699ejc.853.2022.01.12.18.01.52; Wed, 12 Jan 2022 18:01:53 -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=KxB3ncum; 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 7B86368B0CC; Thu, 13 Jan 2022 03:53:02 +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 34FF068B0B1 for ; Thu, 13 Jan 2022 03:52:59 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id kl12so5082920qvb.5 for ; Wed, 12 Jan 2022 17:52:59 -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=DHINQibkE32hh6fGhiuuDxxqJyzs7EILMp35dyMR3zM=; b=KxB3ncum49OHJyeiu3+peRM78ZoU/pH6gO/JtPaLDGBW0+/BGZx9ViAxVgGx047k1A bZPkURybVaOpVM9K0WjkconMSh2usS0KOwh+XPK0Q+wKfMJxjdFb3Kj34nz6Cldr/Utf 6mOTLv+tctlQT3mGD2/Cfi4zUiDatL1Qbz7Z67qFnHvDmhyGnK3bBIn4aqsP3syXfuXz xFZyYIqFoDWkT//NgjcCyCiNjNJM60ZWhZt5FaNk9SGyUUiPfq/yEgo1b1dJp1Xn/phM M3S5bnFH4Bdg7+ZH6Zme9bjuxaTFFBgdLK1WGzhSAKJANWhW8ecE68omAn85dm2E5+cz 4alA== 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=DHINQibkE32hh6fGhiuuDxxqJyzs7EILMp35dyMR3zM=; b=WvhO4LozdCTn6J9AQxvwZLc9EokyTyvHjic19jZ+YVp75ppi7lG6wIt2wzYQCYc6R+ ozGwnFufvAv4FOt5fF93UPpzzDFTnxFB6LxORDzQiGnYWsqYYTu8RlhPFkfayg/5xJNO mIzT/xNCZlDd2CPyNin24cxW1G2td4DOW9zYVf9IIS6GjbNK/NL3zpITwwh2z0kLp49j g0fhuSikK0Ox+Q1KvhJd5YCFXRE0T12qP7jQeRmizKzrpa0lxLT42LM1SLpIXV6AlfIO XAfgRJFZPq5JcNek6qPe09B4Ezcis+NV6ibq3obQMtuwS9QFADwf6yDv147ofj5RW8y+ M8Mg== X-Gm-Message-State: AOAM533MvRElNRwnM083apnFiJkFWySrN+grNjmp5JATZw1GGzCWXoXP gmqTF+tqfnairFz05JH+lYFxd8CxtHY= X-Received: by 2002:a0c:beca:: with SMTP id f10mr2346704qvj.97.1642038777820; Wed, 12 Jan 2022 17:52:57 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:57 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:10 -0300 Message-Id: <20220113015101.4-49-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 048/281] dhav: 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: Ug9VHYxKHY/x From: Anton Khirnov Signed-off-by: James Almer --- libavformat/dhav.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/dhav.c b/libavformat/dhav.c index 6c1cdde32c..935f805632 100644 --- a/libavformat/dhav.c +++ b/libavformat/dhav.c @@ -395,7 +395,8 @@ retry: default: avpriv_request_sample(s, "Unknown audio codec %X", dhav->audio_codec); } st->duration = dhav->duration; - st->codecpar->channels = dhav->audio_channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = dhav->audio_channels; st->codecpar->sample_rate = dhav->sample_rate; st->priv_data = dst = av_mallocz(sizeof(DHAVStream)); if (!st->priv_data)