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 2AC3142DE4 for ; Thu, 13 Jan 2022 02:19:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC5BB68B354; Thu, 13 Jan 2022 03:58:43 +0200 (EET) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F44B68B34A for ; Thu, 13 Jan 2022 03:58:33 +0200 (EET) Received: by mail-qt1-f175.google.com with SMTP id h15so967212qtx.0 for ; Wed, 12 Jan 2022 17:58:33 -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=P8/KT+2QK9VPL5r+eWWlZ2D8YuKbT+7iaqO7G3xbASE=; b=I0OKd8k87ZKzUia3Qrx2a70XTA8xlKTYzXmKTWgKLIfkBHtmKrnEixlGKTRNi1KKgt XuPiAAH/h2R9Aa78hhodGxcHdr1zHNXn2nBAT1aiuNzh26hL1pq2Kl3nxDAvh52LLBrQ 91vNdxubDcfdcTU9N2r4cnFt/R/yW3ZMFBtXAPrAaifZMouJeWFp1p5wCIsTkRJOvgkR V5yt3cjX57+sC0zkf8RfaKVHxThhryHfznEqpVvRIDBlfxgzUciPMxB8GWCLh/NpWi0c CLQZE1KkTre6aIgv9TC6JMAFo+5Sz5Z6cqWSX5juZHsXfMqq3m0tVoNE9HxV/smAZnf3 wTRA== 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=P8/KT+2QK9VPL5r+eWWlZ2D8YuKbT+7iaqO7G3xbASE=; b=D3HYDoXMzAe/9nfio+8+K9gFqz111HhlLQcXtNubnI4qL0fpyEPjEVn4nEsQdQ3KME S8LVi8sjaocw7gCOFDa6eVh/aQs6rvylZGPVsq+PlplsoO/1+XZ5u7kaOFyyoOQvl6nw Ks0dznYOW0LAucNhweUB9QKjkpPy8wDp2al8bKTmTnrB/keKzgEHvCzpjIKAaytMPDyu 8vzQR+9hRwf1q75LV78cMsPIvotHqe3mJPFxR9hMSO8Y+J0KsNbNOXBBOjvx7vD0r41T zUM/MKuDCOovvARtTnGicb1gc53/+S2YWGklOWHABqTw0244tpFXC30efbz2NXExxCU9 DDsw== X-Gm-Message-State: AOAM530cIYAD7LmdiGxSza9s9I8m/iw1QtF3BXjGxqMrDBuzN0O1d5Tf wZG+ANv1d4zvc25PlCVPcDzC+lrPLr8= X-Google-Smtp-Source: ABdhPJwg17ICXrMZtwPNlUdITd0z+05hAdFmLw/WBgBtgvjH/X/HpnjVJ20zj/oNueuHjHPTs3Lq0g== X-Received: by 2002:ac8:1186:: with SMTP id d6mr2051457qtj.192.1642039112034; Wed, 12 Jan 2022 17:58:32 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:31 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:41 -0300 Message-Id: <20220113015806.519-6-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 124/281] pvf: 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: Anton Khirnov Signed-off-by: James Almer --- libavformat/pvfdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/pvfdec.c b/libavformat/pvfdec.c index 7205b0b37d..1654bcbc83 100644 --- a/libavformat/pvfdec.c +++ b/libavformat/pvfdec.c @@ -54,11 +54,12 @@ static int pvf_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->channels = channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = channels; st->codecpar->sample_rate = sample_rate; st->codecpar->codec_id = ff_get_pcm_codec_id(bps, 0, 1, 0xFFFF); st->codecpar->bits_per_coded_sample = bps; - st->codecpar->block_align = bps * st->codecpar->channels / 8; + st->codecpar->block_align = bps * st->codecpar->ch_layout.nb_channels / 8; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_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".