From patchwork Thu Jan 13 01:55:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33378 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp25945iog; Wed, 12 Jan 2022 18:13:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJz25RoTrU6y6OvwIKYZhGZyUMFkXTj5h8Yuz8FzuVEoJ1CRgP4xT4Neummgui5bVfBrCAgK X-Received: by 2002:a50:c94b:: with SMTP id p11mr2342378edh.173.1642040015822; Wed, 12 Jan 2022 18:13:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040015; cv=none; d=google.com; s=arc-20160816; b=QW/dNt00WPOlAEx41IKbNDJ5VT5oOzkxznovuaWT4o8YvO8uev9cOl49v3gQqeh7Z+ LsHGkm2n0VGETTzAeSYlsWvp6coLdjinCaqkNDJlDfX7rTi1/yurXxjJ5iZarxDjG2UB OWpf4imQMWHGx6xPYPu9yqn3H6KaauFWStGkEtY2yAKTH/eO2qSdjEfEDsBKGbErrnyL 5vkFfhUKgjdc9RvlUFfrCaCo/uedflqVt+rHnKH1jXf2BfBjyAiDBHI5RrU6MXJ9PU+v BuMa5zSHnyPS+ZwlHdAGq/6J5Kl340rLipZzEOUt2UChSGCKMjkWTb+j8wv/E8Rso+t/ BmqQ== 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=am2xbX8CQyEmiyPq11en/JyoodpdDPoptO8ZtW5aHfM=; b=uuPXJMUsznPI51po3nIQQ3tcgqG+e/D43Ul74aAPZz4gWPdwPE+pIdlxE0yImhD62J 8ZhAdEJ1OgUBUPKym59fm0afxsFiLuCOWloxQmXWbcVzZAwrSj4Mq32sraaGsZouqTRd nwvDNc6hqpeB9PMDLKk11IwsQ5dZ5I570aRVd+YUIWGSvtFvxOJuct8Jp+tQsG4Geu1N i/r6OWdUZZlz9110fcuQZg2r9nby9tQVA3eauzQFn9jZMsZJ4KdelBqmqrKKyvere6Ft 29/g9Hzrwx5RsGHuvOPDi4Be7juait1klfr46azhAegYVK//Y8L0Jme2gs+6ZWMVylLV FJ9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Hiv4WJ4o; 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 t10si1045486edd.120.2022.01.12.18.13.35; Wed, 12 Jan 2022 18:13:35 -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=Hiv4WJ4o; 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 E7E8F68B266; Thu, 13 Jan 2022 03:56:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E73E68B253 for ; Thu, 13 Jan 2022 03:56:38 +0200 (EET) Received: by mail-qt1-f176.google.com with SMTP id g21so5202524qtk.4 for ; Wed, 12 Jan 2022 17:56:38 -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=fHS1mV98DQ2nb6VzE7cANWViRfXASTwFZygka/QqIIE=; b=Hiv4WJ4ouqtULIPG+/UyT+JhM4clz767EbfB9m1nptMkgm/TEZX+0v+xvZLf6in747 OMKGLy4q5ELTcCjGDcnzf0okR1NCr0VN3uMO3fyupMeubJayDYqJL8cA0q14HA7DtmMv 8qndcj+sq+MdaYr+52tcHloCZlYLgKdgXxBX3uBRsBtOnJD0ePiTBN77TBCnIW9oxshC FOdW43W4E8xcFMX148J6+ud+4w1F+MXg7pDeY6I9SFIfD0+9EAS8I8u2I5HJ4A+nT0XK dQ16DtI3yHfnBo/bMMuD73alft06Zo1Q8HFyE5VqXMSe86ydQ+E8A/45haxD0RVg4kbv tD8Q== 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=fHS1mV98DQ2nb6VzE7cANWViRfXASTwFZygka/QqIIE=; b=gg8sBRgve/zOyRI22SY8prt7JhRbHM0c3q9+FlycSjejPlcIbC8ufykcRd3mRpGHbE bbi4RiOuS5HYYJUtodKrVX6fDyK2p1YRHs76llW/2pqeRKIGAcVqtv9RGQgOa2hGhB9y sD7zEJn+6xu1vHfxSyAV+QR4TahbRqL4dcQXrbV2wBjZywfvpSlXBDjqCNfg4idwI7w5 +yi34jvFeSE1n6iCqdepaFjv1e5+QcVT6kzmEQtXEssEZUY+5QlDbEENA3uAygONF2/u XNTeJ0EwGzabLjtMjNsqqzjvvjFK7JErpS1ihEtZi7pr3FO6b7hC7xmYY4ZrRQytzEiI Yc9A== X-Gm-Message-State: AOAM533ZswgSwjJseQu8eEJwI8BsQKVpjKUjRQf9qCZ8V2dheNkW0QU3 xPIgSSSh7Ee+8Jrk6SUBH8IzI/u5Oj0= X-Received: by 2002:a05:622a:18a0:: with SMTP id v32mr1928504qtc.681.1642038997376; Wed, 12 Jan 2022 17:56:37 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:37 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:52 -0300 Message-Id: <20220113015612.448-11-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 099/281] mpc: 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: fcpBRTT9SwRo From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/mpc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/mpc.c b/libavformat/mpc.c index b5b2bab33c..f36768b5ff 100644 --- a/libavformat/mpc.c +++ b/libavformat/mpc.c @@ -95,8 +95,7 @@ static int mpc_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_MUSEPACK7; - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; st->codecpar->bits_per_coded_sample = 16; if ((ret = ff_get_extradata(s, st->codecpar, s->pb, 16)) < 0)