From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B065C42F40 for ; Thu, 13 Jan 2022 02:44:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0A1068B965; Thu, 13 Jan 2022 04:07:34 +0200 (EET) Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59CF668B95D for ; Thu, 13 Jan 2022 04:07:28 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id q24so1572303qtp.5 for ; Wed, 12 Jan 2022 18:07:28 -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=ewNFqo+c+fLhaQxrtLMMwe7V3f8iYZ6E8luUo+woD4Q=; b=Vq5dlDYwU/bI6f54P/crmUrQ5+6AZGtcNHhwh066ANaUSA7e1uISjJ/edo8y++d0OG P23Ja8aTcc4+t/qUdYqfIR8iYNZ3RBbxHq27N0gKXbUrWoUcVyVZ2bha2l+aD2gbL5N+ ZytBHnCds4MLoU65fHl9djJ7IDZYS9LowsT1Ny2aYXzxu3g9yTDT8eniyThCxiPLbPs7 nY/5NJmcrBHxHjMpMnGVI88VS/Syr1ap4tarwqY4C08j7S2eyro9NiNBFISvgfJbPZIl M/DorDZkCuao3G3sxSTiknGiYNaqpyFMwS1mmiYsMKw5mgnnlWZbvGiPTOHAKqJAav0Z +Rig== 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=ewNFqo+c+fLhaQxrtLMMwe7V3f8iYZ6E8luUo+woD4Q=; b=TxPfSSzZ0yA+a/r3lyRRpYECykMP2U3f1NYvDQAWJ/Y9vwDsm1ogmOvfu4JwsL8OXi 9dc1hRkP/fiKgvP1V0Ju1PWCS5pNKRB44UaMTpgpHKZh/XGvQMNbalPx0gjikGQLrgmD bdNwydSUBfOXOnS1vbav4buIg6LB/bYZ/tkTG+Y95eKkylA/cv/S+ALgHr4Zl8nuyGkW HIalS9ifehVi3E6SWRh9qXEanXFSHXLhJsa08AaQg7tKj9ZulB5Vani5tqXpbX+7ZvbN OFxQUUCo24u60WaCmxcMoyNTdhRtDqFBaKdJZ5EcrsZ+ybIvz9Nn6KkxBJTO5xSoGQX6 v0HQ== X-Gm-Message-State: AOAM531HN3ygGr6EpWp/YE3BPruhbwaFkxLNlhwxOobO5XzTLNRX/gO4 yqX1UiHhqvUL8vPb9MTo+ypJ1eBX1UU= X-Google-Smtp-Source: ABdhPJw/LsaYoSOl55jxO3ClN6LoHjCAUY/rIKDrD5gEb5/uCsJAeQBdtWyRMOlkQ+6MTYszhCt/+A== X-Received: by 2002:ac8:5a47:: with SMTP id o7mr1987277qta.613.1642039647003; Wed, 12 Jan 2022 18:07:27 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:06:44 -0300 Message-Id: <20220113020713.801-1-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 240/281] mpc8: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavcodec/mpc8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index ae07093338..a0466ec135 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -169,8 +169,8 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) c->frames = 1 << (get_bits(&gb, 3) * 2); avctx->sample_fmt = AV_SAMPLE_FMT_S16P; - avctx->channel_layout = (channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; - avctx->channels = channels; + av_channel_layout_uninit(&avctx->ch_layout); + av_channel_layout_default(&avctx->ch_layout, channels); ff_thread_once(&init_static_once, mpc8_init_static); @@ -358,7 +358,7 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data, ff_mpc_dequantize_and_synth(c, maxband - 1, (int16_t **)frame->extended_data, - avctx->channels); + avctx->ch_layout.nb_channels); c->cur_frame++; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".