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 374AD42D6E for ; Thu, 13 Jan 2022 02:20:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 908FA68B37F; Thu, 13 Jan 2022 03:58:46 +0200 (EET) Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E46068B359 for ; Thu, 13 Jan 2022 03:58:40 +0200 (EET) Received: by mail-qv1-f46.google.com with SMTP id r6so5045519qvr.13 for ; Wed, 12 Jan 2022 17:58:40 -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=yeWKNQldFjW5C6PISOhybIquqti4mnIP9MpeQxtA0C4=; b=lXuG9UebjvOfA0ter9VpA16nqnTef72sYJM+bfKqGu4Vn5wxD7kig54m5NC0WFji0m 1U1iRe62sgM21qZt0bSeIB67ocGrRo+QtXYaBGvJ/7O9EcEcW/Z8PGGvpOiSHvhlpYoo BFcAgbhsGXoKNiQ9XcEQSUArypaZrnpX+ZECcVMS92PDbnSooUujdC6O6RHmMFIs9HBF XQmHG2SXDg1m4NPO+oDl2Pxmrh9/kR1bVnvbILxMWusnbYlzD4cX8Q1ZudFs/ptNtHND U8iN7fDXI4wl3JH9XcSXVkMxuFDNJcnBH9Z1PO3rSif5Il26rf+TzV0y0RHRk3dDXmXd mbJQ== 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=yeWKNQldFjW5C6PISOhybIquqti4mnIP9MpeQxtA0C4=; b=rq1TGN52nEpDIRdTZQ2k4pf5h6KvSpvPYXdjVHHCVt17DvVEvtowj87SL4u2MRZ1FG kXGyy3ee0Fxd9L8SyOAoJUqZYyZMF1tYL5eM+lJm+5uFbaVZehd9cJDEpTuu2BTxDeqK YMcwOWMsWLLfFQIkp+rf0nUDxmyMD/9GAw8600yg60SCwEPnfiaQSKbyxG5ryTPTETJw 11KWBNeMooo7hLh0LIYNI+NJ4VjcMT8kOH885jNMwp9PSG2sftibTO7yER7X2lwoCVmF mvAYuHdLT9N+9dij8lxNGkuGZOSx7IsVvn96wWvgUjGUU+ehNwQolhbCcoKEgOHdhGGB Btpg== X-Gm-Message-State: AOAM531sYKlZhVlVXHXrZakgJUnVjgBOX3kpwSkBziO2i/baLTuSPR5b 0kZjUQpTDL2hqxil2u9YSjxH3phsH5o= X-Google-Smtp-Source: ABdhPJwH1Gv/jCssB9ULoQS7Ty3v2BVXGmsNFttfUxb7VamWtXn+85g+vEWxzHAWYf+Op+Y4A1bcFg== X-Received: by 2002:ad4:4eab:: with SMTP id ed11mr2187319qvb.27.1642039119342; Wed, 12 Jan 2022 17:58:39 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:47 -0300 Message-Id: <20220113015806.519-12-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 130/281] rl2: 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/rl2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/rl2.c b/libavformat/rl2.c index 6a559c7294..7b4b8d0ba7 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -147,12 +147,13 @@ static av_cold int rl2_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_PCM_U8; st->codecpar->codec_tag = 1; - st->codecpar->channels = channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = channels; st->codecpar->bits_per_coded_sample = 8; st->codecpar->sample_rate = rate; - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * + st->codecpar->bit_rate = channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample; - st->codecpar->block_align = st->codecpar->channels * + st->codecpar->block_align = channels * st->codecpar->bits_per_coded_sample / 8; avpriv_set_pts_info(st,32,1,rate); } -- 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".