From patchwork Thu Jan 13 01:50:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp23957iog; Wed, 12 Jan 2022 18:10:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwm7188ScuALPjce3JjhW3tj51B5DTxP7JkBPNO/GPasTnWGGELNy8qlVk/dRl86hFKw8xg X-Received: by 2002:a17:907:2d9f:: with SMTP id gt31mr1868451ejc.544.1642039831405; Wed, 12 Jan 2022 18:10:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039831; cv=none; d=google.com; s=arc-20160816; b=yVuYO/+pdU5naA+E0RciJp2RI4Ccbnk8g+0o/OwEg84P3JPkoZjONaORZU959UO6XN be4CKu7rF2qRMKZ/fM6g3FPIJJyqbY9wc599osLaBs2BfQUWfUQEC1vIyBF9CVNBFVi3 dEphVUlAsCObb/0raxMLUeT9Pnkw++E3of4KxeqVMHd/aQ99VpVwMz5kDwv75b9aYa/5 vB1usLa7Fv+ePyK6wL5KCNfz2EWyE6O5H+K+JuoV4TqNx6FPcUlQf8oyJik3ihVRRTmC N4V/iF1yKkaLuMHReq9wKotZ2nn+iWDq6VSVYCskMbAyRox5BiokU5pgx5DZjvRiVc3p CSUQ== 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=RNxzd+4F7rMHgnTAdEi2S8s3DNY4bu+46shPGwgEPhc=; b=bvwo49TqyhdjEGFSrFYqhVioB12qdYvSVNP+IV44nLxxPgiHT3ZtLmRuQU6nOvmy0k KW6o+6t9oVjf6XWsIIDrxKyxQdGLnYOkjAQdIVUqOeLzaKFhQYF7dj+ejFKYhBKkbgVR q/RpkvGJn+UqWA6bTE7noBf5wvcLwZDN3GsujQuXaWZP1XRDiMiSZW9SxEAw8cFGjF5v JTtnLlu+5JprHa0LIHG9u68WBKZiEWh2Dyu/q/nsxrjrklWW6ZX+UrY//qHRO20hg9g9 oqUM10dNplvsmXveUwp5TmMHtZTQKC2YWwd+qNsAOU743LLj5PTciIQvBHT0dgdoAK9E WAMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=NZ5Gdcit; 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 dk14si824363edb.270.2022.01.12.18.10.30; Wed, 12 Jan 2022 18:10:31 -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=NZ5Gdcit; 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 6125268B20A; Thu, 13 Jan 2022 03:53:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5215668B0D1 for ; Thu, 13 Jan 2022 03:53:44 +0200 (EET) Received: by mail-qt1-f172.google.com with SMTP id l17so5324400qtk.7 for ; Wed, 12 Jan 2022 17:53:44 -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=iKqnV6LOz9MTCJNOF4yGSWxGWqg7LEjHzPBTp8PAMS8=; b=NZ5Gdcit9oexMUDAgMDmJ7MUGqDI7qTomN2lVYkiV827mtzk26brrwVoqp47x7WWAJ O6QCvQ7CAmMwr1pMBM7WLTaUSRrK6Fl9ZVmNGhD+XhBQFO2nB2Cs7EcOf9Onu+94aMxt pCO7iRYm3bjKMKJLPpgJ78LXOt8LZOwIRY7Yw09HfUcYJGRKWkM2LYQr7kD+u1fwthIW qHi32I5L6qNirvL3FE1Afdr6EfCkeEVUmIs+jJU2145N7BDTuwFTVVuJ/pv79j3slj+y HMKXOnrclHH/qgkbplkXqD31nhDH+uaHA4Q3UeUXX10ok9LHrkYZctZPub4uF06qFpvU NwSA== 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=iKqnV6LOz9MTCJNOF4yGSWxGWqg7LEjHzPBTp8PAMS8=; b=fkSX3jwLhzLThq2xFP9aaXjAydsGtVZx0R/xglZO1Mz4akM/QAZzXRnakHvN+K0H2Z t4P9JKSrCjzT9TVrpNmOyCEH8/RgnxPizM4IOprhXRAM4p3cTeOOmeEd+fYewfClcaq7 EBtjlvWaD0uyDlLFfni06GU9k3se2yJnPH5oW8ysKND+LJCKVydT2Ac66cB2R74tTSo0 BFuSxtdJK/CY4JVVAxfCHN+AuHg7Pca01LJr/hgKriktmojAjNti3yxcbR1mYzsIIfKV waTElH66yqA2zvXolFShJBqD1mqaUYm0999FvTmlK/DZphXLwIt2hkzwZsfucrytLs/d uCEQ== X-Gm-Message-State: AOAM533f8hnkH95ikHUOSdrps9IIfeqHcfqs/jz8MN7aQmKEH3g426bu pma95HK/bWi+IjakQItp0fPk6mJYEVU= X-Received: by 2002:ac8:5dcb:: with SMTP id e11mr675130qtx.316.1642038822811; Wed, 12 Jan 2022 17:53:42 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:47 -0300 Message-Id: <20220113015101.4-86-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 085/281] jvdec: 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: pzJ0zW8mde27 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/jvdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c index 93569c87df..14e53e5c70 100644 --- a/libavformat/jvdec.c +++ b/libavformat/jvdec.c @@ -102,8 +102,7 @@ static int read_header(AVFormatContext *s) ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8; ast->codecpar->codec_tag = 0; /* no fourcc */ ast->codecpar->sample_rate = avio_rl16(pb); - ast->codecpar->channels = 1; - ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + ast->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;; avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate); avio_skip(pb, 10);