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 A512142F5C for ; Thu, 13 Jan 2022 02:44:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACDB668B912; Thu, 13 Jan 2022 04:06:11 +0200 (EET) Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 916EF68B909 for ; Thu, 13 Jan 2022 04:06:08 +0200 (EET) Received: by mail-qt1-f178.google.com with SMTP id g21so5225325qtk.4 for ; Wed, 12 Jan 2022 18:06:08 -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=wZc1QjmpY+dyqdy3gEzhMVkgegxEUd3mSkjhbRLPy+E=; b=dKwjZjDfwuhJB+qMA17sdqJz+GEh8V9CAKt9AbEOCZxOXKSBWCIKUmn2LFDdq2fgMo FdiV1L+/1yhbkC+Iws1Xu9ScdPO6j3PHsJCoCuEsKu+4x4ohUri4nOW+c9xMaz9li/W6 zmPxiw8KLGrd0ubNW5DumiPXevXyRbQSrvWA2BOCnTq7eV99+8KBjIYM6VGgQRaGEQw9 qH6/fuDCCv89eoDxEhMMRTRbq86Z6Y53ibEoOz4MJ7peaBHE5EQ2u3N3atOdu7HCN0Ua rn5EE7SWsCS1wUVPj5ImzNBm8SbMiYNI06Y8jpBarEzeakLKi4IetTJf1qhU7apr7tp3 wgSQ== 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=wZc1QjmpY+dyqdy3gEzhMVkgegxEUd3mSkjhbRLPy+E=; b=5LcQogPzDDatK9Avq1yLIJFMA2qOOa3Nu/mPrxLcJ/eG0e3d18R/CXzG4rSuLjZcXU WWx3QH+cSf2+jVbJtmFCOKrdb6X2zOJNJy7/2c1B3oOof1Z2lvNFKC/wvDESm++nPG08 GkQaxluB5ZDYBYl1WeQvvzspPXF1ijBW5E7dzogwrbPZrELA65drQoCpIpvnrY1YM0IF lYTkolyrGURmEK/Ltl4WxnYhHRt4n8si4FSjF6/NVbNjBoNB4Exkh2Ln8gzcEe+YP965 UFpzR4rxbmtzCH61YUsp/xSocsiuquI7+BGQxiJXlmBNLaSnEde0JxcXz+mTAO323eV0 lHZw== X-Gm-Message-State: AOAM531oI+WucNBUi48jgBjpweBwINW2vli89SrP09QVFhMVqwjLjSU0 sDlasr2lEEipwQ2QTgzevDnsxwlrG8E= X-Google-Smtp-Source: ABdhPJzv7uXGe36xtUtNov62UbrCHCqjlokgWdr5+zWXrMPZzn5G686LXtg2Wh4vHrRkOt4bLsMFNQ== X-Received: by 2002:a05:622a:164b:: with SMTP id y11mr2014277qtj.621.1642039566999; Wed, 12 Jan 2022 18:06:06 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.06.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:06:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:18 -0300 Message-Id: <20220113020518.730-30-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 239/281] mpc7: 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: James Almer --- libavcodec/mpc7.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index c1a63203d6..c3ca9cfe31 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -79,8 +79,8 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) LOCAL_ALIGNED_16(uint8_t, buf, [16]); /* Musepack SV7 is always stereo */ - if (avctx->channels != 2) { - avpriv_request_sample(avctx, "%d channels", avctx->channels); + if (avctx->ch_layout.nb_channels != 2) { + avpriv_request_sample(avctx, "%d channels", avctx->ch_layout.nb_channels); return AVERROR_PATCHWELCOME; } @@ -110,7 +110,8 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) c->frames_to_skip = 0; avctx->sample_fmt = AV_SAMPLE_FMT_S16P; - avctx->channel_layout = AV_CH_LAYOUT_STEREO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; ff_thread_once(&init_static_once, mpc7_init_static); -- 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".