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 29D4442FB0 for ; Thu, 13 Jan 2022 02:50:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05E7668BA48; Thu, 13 Jan 2022 04:08:06 +0200 (EET) Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C71F68BA3A for ; Thu, 13 Jan 2022 04:08:02 +0200 (EET) Received: by mail-qv1-f52.google.com with SMTP id q3so5142536qvc.7 for ; Wed, 12 Jan 2022 18:08:02 -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=L2phcX/UUp966sDI6gTk6laEGIGGrzLA4KUg+RBq5AM=; b=Rq06eXNuyMt/qgm/jT1hrf8Z4OoB1eM84KUjqsvCWZ0GNv9fUzPi3AEkN/44S1qSTK g8pTlMSdDRnpFce/4mqG+Z61eFUN5N1nCp47wos1WWU0pzXO2woKtAvR5+HUUBGZTt0b XRbYyEwnf9vRLAOsq5yan0lKtxZHUSTwS5pqTqENxSQBtFW2c5T+aYqYFlJpWdJx23/h frjVfHbTNbmW+8L5Aw12TTHgeoDOl/ou52GCIv3bf26Gc94ZxVPh6k1gBCIvEUD8hV0x M0cCLhwylqeltJdGpcCgM9qwyFwXhtwOilT0OZ5Se8Y13xRf8eWpM2Y5LdG6cu/pzIbd tOEQ== 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=L2phcX/UUp966sDI6gTk6laEGIGGrzLA4KUg+RBq5AM=; b=mKb3FuuxQ3sHCPoxLA+0Z3LNAYqFTYzIx+cY/XX0Hh7V0HdHjrsWw1N1kaI+Tq3wRx LthH9dLbBjPDXv16AWsS0s3wM+Ofn8rOxkT2l7El+fYe3UsVw7Gv5rbQeCTiXaSO0Xlv E7Q95lpC/u2H6P5LHhfYn3D5ZQFsDuWOhP3E/IXqvLnXEQmyDbd1b9IfyhuZA1QJM6fl tBlGKIBO0sV8EaRYTdbrCa64hq5uI0UDNy/o6+FZTfKYMALSxsUjc/6nAJF1cro07dJO EhGgIUw30VIC2gwP8vCXjX8z+nzVXDMvxdkM+fDLpm+zI8pARSTswajCISizjlxM/uXX 5grg== X-Gm-Message-State: AOAM533ulF1qsxBRuMRjeM2AiB2PpCceNsHygRWeDeWahh6csPpt8iZn Tsi0hj6YSeUHIWpEFKRsoPNwNyaS2/w= X-Google-Smtp-Source: ABdhPJw2YxXaPGUkO57TqFxjs0cPWWkvkzCieKDkLPx9fDfOoFFdFnIAOX2yHIQCGHZohqQyDtLU1A== X-Received: by 2002:a05:6214:2349:: with SMTP id hu9mr2163465qvb.93.1642039681022; Wed, 12 Jan 2022 18:08:01 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.08.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:08:00 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:07:10 -0300 Message-Id: <20220113020713.801-27-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 266/281] vima: 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: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavcodec/vima.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vima.c b/libavcodec/vima.c index c9a81e4401..5053feda90 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -147,9 +147,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, channel_hint[0] = ~channel_hint[0]; channels = 2; } - avctx->channels = channels; - avctx->channel_layout = (channels == 2) ? AV_CH_LAYOUT_STEREO - : AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + av_channel_layout_default(&avctx->ch_layout, channels); pcm_data[0] = get_sbits(&gb, 16); if (channels > 1) { channel_hint[1] = get_sbits(&gb, 8); -- 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".