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 5885242CF8 for ; Thu, 13 Jan 2022 02:02:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EEA668B0DD; Thu, 13 Jan 2022 03:53:05 +0200 (EET) Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B40C368B0BC for ; Thu, 13 Jan 2022 03:53:01 +0200 (EET) Received: by mail-qv1-f54.google.com with SMTP id kl12so5082994qvb.5 for ; Wed, 12 Jan 2022 17:53:01 -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=C6h8t0hsvl4Dz/rLm1krrgpVsQPko7v23V+WayFbxnU=; b=mKCLcTm824/9YayZ8VBNoDJ+6sButBjds0u6jTTSY5th70b7rlPnpf7j7H6w/V3y5l JLChmAZ7fO3n2jqXGruU6VzIW0WsyWsfhxynWF6s3gijXr1s7aFB5GDEUpm08tjscMuw Gc3FWnrSqLT2dvTMjzYbFQEs27v7BF5uYbUlrk7GDbs0lXozy74nFN+UY7zjOx+e2G/g KGU0hwqQS2R2c2I4WHcPIi2NyXifRF63kPymosZlFxnGmr67MBw/yMBl4GCZVsnEiWzL b8saJ7zudcJ7KsW6IyNcppkQSMhcWYCbVULjDZg7nouDWx9uwi3o32oVWxwQePO8SN3u Ufjg== 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=C6h8t0hsvl4Dz/rLm1krrgpVsQPko7v23V+WayFbxnU=; b=Bisn5nrByjyMGJRcit+6yvxdEX3OUw2QFSGZbmIfPaTIgLk/JP9vjYfZkzD9dTEGWA 5Ce4gu283dZZvXPlaZiXQY1XYAm3HEhdk6lxE0uZZRraGo6xF0rMQcbi/hpQLzRYnE53 i0VLEQ9Oy1sTJLoLYwlu/xiivLKrxoSDROE+FYeyHGek94pX7Pp19BXos2JXzm7Kf0dZ h71ponw5zFxJtR39GXrv1AEU2rnVYEMQN4r9uWLexZvGbokvpJ2IUAk8M9mWbhkDznW1 io/VCUzw0aO5wmUhIMWdor5i6vGD8J4psgG0gy+nDkiOuSzrN8twq5NPSqU47kOP99W/ lIvw== X-Gm-Message-State: AOAM5331kxQbY8HY6p8v06kgdxJksCljw9mEDxWSUo3L/v97HscROUo4 qGmhAU4dXSdTJg2MzbPTLERZPZQes6Y= X-Google-Smtp-Source: ABdhPJwpDn6Sd9YVH3NauwngMBqoQ/WWM3bJMUoE/xaXHknLBLxXm1rndK26WuABImO3ghqRfqV0iQ== X-Received: by 2002:a05:6214:230d:: with SMTP id gc13mr2291506qvb.68.1642038780313; Wed, 12 Jan 2022 17:53:00 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:59 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:12 -0300 Message-Id: <20220113015101.4-51-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 050/281] dsicin: 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: James Almer --- libavformat/dsicin.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c index 481f365a53..13ee9f87bb 100644 --- a/libavformat/dsicin.c +++ b/libavformat/dsicin.c @@ -132,11 +132,12 @@ static int cin_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_DSICINAUDIO; st->codecpar->codec_tag = 0; /* no tag */ - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->sample_rate = 22050; st->codecpar->bits_per_coded_sample = 8; - st->codecpar->bit_rate = st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample * st->codecpar->channels; + st->codecpar->bit_rate = st->codecpar->sample_rate * + st->codecpar->bits_per_coded_sample * + st->codecpar->ch_layout.nb_channels; return 0; } -- 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".