From patchwork Thu Jan 13 02:02:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33478 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp39579iog; Wed, 12 Jan 2022 18:37:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbulnzgN5wXNLEnV0Dbm8KvaOGQOSQUlPDvVp5v3J6CB685ido9DUCG5PKaCFkAvdFiFsi X-Received: by 2002:a05:6402:13d4:: with SMTP id a20mr342133edx.233.1642041460439; Wed, 12 Jan 2022 18:37:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041460; cv=none; d=google.com; s=arc-20160816; b=GZLihsGf++qrNtpE3GXf4MnDyA1Q3fEqS3g4PSF/jVHlTtIE623fkC3z/zOu20EMTg UJVveDeiPsqf0ISQXCBMFm7LJ4OyRu2DxoCV/qSXKjGWTPLNQ/kbsVTKLGs2jAYhtON8 Rq3+L4/dU+K8cFJnqBRBULOCaO3ZvFUxcT0MlEP4+JurdqRPGtjA7yHZ3uXsiKmM1Or7 t3lw0D4uh/xheI+F+6VnMORJAiAiMdU+gqk8ZzFeRZbEs3w2L2i4rxHBmwOFNtOQCfW6 PlxcJ6MaIHcx74KNSNuDG/J3UljUAeswmgvZyKNJAYnS9xr4G3bBeCu8Fl9/b4aTtrhU c+uQ== 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=1YdOZ68MuOZVaEQuNqbwBYgOXrC2Qfh/oR9IqgoTsUE=; b=c5NChzGPZTmWAvna/xTrLRMouxzZOb9fRFmmUUkQS5WoHtxIFwjGjUhhaSBTxRK/Eg acsXrEogoApejthdg0bd9Xs1qHhgzXZLPnn+rEX5h/GBoyVokzw4xt150uR9KnZK8dyf PjLJOO4zzH+nLsJKrX+v/zXBl2nTtgYpWXNtByMiEMeji0FnOIKvD8igp5WaKjbLBlAS csYH70Sq+sP6/dnoIq+3LtBs0gxzQU9dQTgBgIUcihi69tJjZQyIieXRAtm299+ZaR1m pI9Gj7AFksIrMxNNnkKv6a5EhF682a3wavJ1iaDqr9c2vlQkOsg7R3Pq16s4p1tS8+ut rYjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mJ48Zjz0; 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 a24si832300edv.289.2022.01.12.18.37.40; Wed, 12 Jan 2022 18:37:40 -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=mJ48Zjz0; 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 3789368B793; Thu, 13 Jan 2022 04:03:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2B3968B773 for ; Thu, 13 Jan 2022 04:03:27 +0200 (EET) Received: by mail-qv1-f41.google.com with SMTP id q4so5105367qvh.9 for ; Wed, 12 Jan 2022 18:03:27 -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=Ilud+C9w4INqAVqOiRel9nrbhVHxbZ5UgCgI3mJVG0M=; b=mJ48Zjz0GXRocIy1nvdj50q7KFQ7DcJrmzGIcI3C4YgSm0sr71F97uyEQqgYbOLrMD r0i0sVVZuKnbAvfznIfi/3Ki+N4YiwIJ2J9zijUmAXlLduEuT1waw5744Zfc5JfgVT7R 2W7ITU94wQAXxgZWLKUjC3IR1zT/6cIr+8b3X3U8Xfyydsdj5B6QfXRf861jiPiaoJO2 vl2zjE8XQflR8lH9LwOdF06seDVxQ8X+IkY9PaT0ejYGO/O5pgfpo5viBsTalxxL1XNn BjHxu1519JJpK7/0PYcqWyVB5dN2oOidhH9mbD4wfpw7m2NdzHAKX3jhue+MIkbiRkoH 5Icg== 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=Ilud+C9w4INqAVqOiRel9nrbhVHxbZ5UgCgI3mJVG0M=; b=s0paIIlCHDcuJ3H4JY3IeXbmJyL9hUuwuciS40yeRNIKP+7YXt2ZgjnYhJZ7qti0sf 1pqOaqUhEbWu0hw8UUmVHQcphSKMqUeEVkw7XakKHvbXaC3c5vEKjfcgIIlsnELDbsPB wRn8p1DN3FUyF4BH/KJ30D1h+foDSqEDNKeabAlu2K9JeWcZx+dZAM1eG8vYvIlqqrML nAK3H35uFPmKIqc3R/M+oO3ohdjoW3b06bkdJYJ6V0QnUtoWyoC9BNi+sM+5AyY0wycU tQLgnSfoojdSC5B8XU3HTqsMj+FrR9eNJmg2IU70tQ+i/WMFSpdAoI48o3CSnxOONyyx uCGg== X-Gm-Message-State: AOAM532Kn5GUZwn+52tOBINjcMuks9BwhXYtac0ZaWnAJIMtC+uMpVHy pKKoqit6GnF2YlfIK83bZKJTeAGHJiw= X-Received: by 2002:a05:6214:e67:: with SMTP id jz7mr2452032qvb.85.1642039406419; Wed, 12 Jan 2022 18:03:26 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id v1sm1045961qtc.95.2022.01.12.18.03.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:03:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:02:37 -0300 Message-Id: <20220113020242.661-25-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 204/281] dsicinav: 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: B65DeNO3jxLI From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/dsicinaudio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dsicinaudio.c b/libavcodec/dsicinaudio.c index 39869ac0cd..a543f6dd09 100644 --- a/libavcodec/dsicinaudio.c +++ b/libavcodec/dsicinaudio.c @@ -80,8 +80,8 @@ static av_cold int cinaudio_decode_init(AVCodecContext *avctx) cin->initial_decode_frame = 1; cin->delta = 0; avctx->sample_fmt = AV_SAMPLE_FMT_S16; - avctx->channels = 1; - avctx->channel_layout = AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; return 0; }