From patchwork Thu Jan 13 01:50:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33343 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp19804iog; Wed, 12 Jan 2022 18:04:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyft1LMQo1SyCMNtb7K+iojfMNnG/FgtmkXsMGMxYvxMAZykpyge25+fdCVrETffjjovXII X-Received: by 2002:a05:6402:68b:: with SMTP id f11mr2249245edy.121.1642039471164; Wed, 12 Jan 2022 18:04:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039471; cv=none; d=google.com; s=arc-20160816; b=pAQQFY6tPf9Bu3duOBsVrHHk5MH3pYAimYiBZNQPXM7Izhkj6vUNxGKx5sKFcZarqz LPMrYS/y3KO/IiUyZrQWHKJcNCdxkEeMCpYcpthHyr+o+PKBjFwB4SHZU2d66ohWwtmg uM9s/cOZ/zkKuHCSIryqvuVZArF1KPVOhBb698B0UfgxQWg6DSEkXbQkxcg6teAtqd1l rdlChKgyBteTG5VuFkCff9w4iD/PgMc8vnpnhEcIdK+mATAW7pcg5/jfEN5/UDbO3+ls P6xhpBGcqxuq6cm1wwY/gHPvix8DBSywRNKHCjG6avZZfAcyYrNVEluN8euXx2l7Jlj9 d7xg== 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=CioNYNGsSi+pQljqHTPY0arqTz+2daOkhXnI4URrcqY=; b=zVIbuOSW0uzgRMa3jjeWOi5to/5/bwbbbB8cA/e9PYcVQ/EKchjRotqp5gERvUl+Ut LsH9xfLdiJWVRCivfT1Wgfik8qN46eQmeQc1Q08MUUnrW1b8teRSSoA3zSVrDUHACtkg H8ffyGGCjX+NKKsEnCT24D0K+Bk20YvgVg3NTxxfvKpo7znhEqJqo9JTgXJ82p8Gi/xW kgD/qMNb+OObjGPJnhy++uxD1HREh4Ie+DIwTxjgOOo4Lj75pfVe90zZVNohSm/u47oD +Vv3Y+EM35uhef2haQmRSVJ1TXv4cKCMEq1yVX55ZQQ5KjSf2Es6zGjyfVAPsT75gNIL Jj+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Jr5wKVK8; 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 14si689838ejf.611.2022.01.12.18.04.30; Wed, 12 Jan 2022 18:04: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=Jr5wKVK8; 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 4053768B165; Thu, 13 Jan 2022 03:53:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 79E6668B143 for ; Thu, 13 Jan 2022 03:53:12 +0200 (EET) Received: by mail-qt1-f178.google.com with SMTP id c10so5366918qte.2 for ; Wed, 12 Jan 2022 17:53:12 -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=JHmedx0nImdiVWIlvb5leiMDN9pZKAIRkl5cl6zixug=; b=Jr5wKVK8NeY1OAY09k8De4Du/IKi2kNEaIQR54VA3+FTqrYk8b/5fLk1fcUoGVACa7 Pst2ZB2T5oOl3robX+lGRJ9Ss2ur37fv/B8j+3oeM502InWoTaQJnTGsB90bga/g+vj5 u1+Rkb0itd4GGwE/UEYVoQTGvvakKnVVKjG/KWFvBDMwZrRI7S/ca09fhJHr8pAP108F J4dlPxVHj2PovWcGzsinxRcM4wP6VACDXLequo6cJo8UMrP/YAXMAh1XGCw+pcXM34pL 2BJjMCx1o5VFfsS1QD/+kSMdTOwN8OYPWPRFRhLoiy/bXlFy9LI92sasj07dPD3LOK2r 08Qg== 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=JHmedx0nImdiVWIlvb5leiMDN9pZKAIRkl5cl6zixug=; b=prOPtJ97iXhlpOcT1DTJSSSybt+POYpv/Pph3f0XJbz6vGneUxuVgSyHv020+nvLFq GSgAR4xT0CO9WbxjxefZpJUBc9yZD9ghAXzaMcYO+Os8QS7vN0GxsgnVyUAJvd5GL5rl K1pWm5sUXhRwU12PrZzX/re1LNWrILxFIIaVQr8cEOdfbvOZKdEsh55fak0po+Y35ffc OpgfgiJBZhqvZe3SS8m6RCq92fJcupb0qa+iPPN2HSw90FcpFQH4ZOZRupNAjBsyMdQa DpCeiXOXhCwNZBl7QeZTYMeH8+qlzNivZFYsGsXwaktS6NkVkiKcZTFSzb9XX8gNQwny 0rCA== X-Gm-Message-State: AOAM531FVXgSOGstZHf5etpc0QqGaYt717wnCTYGQWz3e6mctsVa/sN1 co40PyJDzk2S2Y/v6mBZodX/bJl7a40= X-Received: by 2002:ac8:7c4a:: with SMTP id o10mr1972856qtv.217.1642038791043; Wed, 12 Jan 2022 17:53:11 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:10 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:21 -0300 Message-Id: <20220113015101.4-60-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 059/281] flic: 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: MCsi2BJ8kDVk From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/flic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/flic.c b/libavformat/flic.c index 44ed696421..496402aa94 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -157,10 +157,10 @@ static int flic_read_header(AVFormatContext *s) ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8; ast->codecpar->codec_tag = 0; ast->codecpar->sample_rate = FLIC_TFTD_SAMPLE_RATE; - ast->codecpar->channels = 1; + ast->codecpar->format = AV_SAMPLE_FMT_U8; ast->codecpar->bit_rate = st->codecpar->sample_rate * 8; ast->codecpar->bits_per_coded_sample = 8; - ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + ast->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; ast->codecpar->extradata_size = 0; /* Since the header information is incorrect we have to figure out the