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 F3CD642DC3 for ; Thu, 13 Jan 2022 02:17:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B887868B316; Thu, 13 Jan 2022 03:57:03 +0200 (EET) Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2F8968B2F2 for ; Thu, 13 Jan 2022 03:57:01 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id 82so5545460qki.10 for ; Wed, 12 Jan 2022 17:57: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=Q/zukf5WoA5EUCj1/r74PK+Ygy/wXjPnQPJX3GFyAU4=; b=cZq3s7cdrShBIdGIjwyqGFnXUwD+2sGX1UMH8F+HQeG9B1j/LuohketrtRTjichH/T 2ZetoCLwH/J+aOAt850MBbgYEElnCILCWRwTqXpeG1mSK7FGSV/a40k+8fNBvb/JwkSx vHdMUHOB95gpBA5BC/IsXHVr+Z3KHhH/RkiHd1C+7LWFlmBM/dhf2F8xMMGnjNMn/iX6 COIbKH1vyO6AIiD9TzgRRzqLjVxlom1GfNO8i8tRvcwCErvrsuJeTUBqQeegRDQxDIHG qV+j3yGrLyognLnydxC+M31+Kf2v4Lg97WQQ+eII5uR7XDYEeAhw+ZAVFHjTcz5XoAkf +4Ww== 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=Q/zukf5WoA5EUCj1/r74PK+Ygy/wXjPnQPJX3GFyAU4=; b=hyvdkAIwenK9IE7Ih1RNxjcXqU6cEkkmw16aiOhaipUYBthqQQZtwm+PO0IMR3qW5+ SXShby/RNdXcFcEwsHmWYLpjuSzvrTOZZmFJOHglVyQvPfhGA6Uf0AMKNhf68YkfZh83 z3yEQ1mo54+KcvVYR8e/MiW7fnEjAN4o19KNHDfjnzvk/+T5j/zqzrL1WwTWQkW4yuJH lWscKhv6Cg48n/ZWxtNnMZ0YFCoHhEfnV687V1doa8R84bHheiG0oH2J+us7wYm9ooEq 0po6uq4mrWF/wXWaxczdpm8Dif8140Di+gYqgHtIONTmFG0dPYJBTRXJt4ayzHdZ4j4z FVUw== X-Gm-Message-State: AOAM531X3SUfqtqhJQKRc3QUkk1IBpUpfuIkwLqyLD6ePyXGd3r78W0Q MSnQMZGYCoHkWWMy4uYdD0TDXGZd4F0= X-Google-Smtp-Source: ABdhPJwdnLe8VrcnmGFh9x08giFbB/UGYmXKxrr1nEwhLTRScPRhHsfT4/VVKNuEtrUIsZAfkeR01A== X-Received: by 2002:a05:620a:2585:: with SMTP id x5mr1831914qko.263.1642039020336; Wed, 12 Jan 2022 17:57:00 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:57:00 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:56:11 -0300 Message-Id: <20220113015612.448-30-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 118/281] oss: port 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 --- libavdevice/oss_dec.c | 3 ++- libavdevice/oss_enc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavdevice/oss_dec.c b/libavdevice/oss_dec.c index 4f3772c1f5..d3fc59d0ea 100644 --- a/libavdevice/oss_dec.c +++ b/libavdevice/oss_dec.c @@ -59,7 +59,8 @@ static int audio_read_header(AVFormatContext *s1) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = s->codec_id; st->codecpar->sample_rate = s->sample_rate; - st->codecpar->channels = s->channels; + st->codecpar->ch_layout.nb_channels = s->channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ return 0; diff --git a/libavdevice/oss_enc.c b/libavdevice/oss_enc.c index 3103d2de9a..d6a512a264 100644 --- a/libavdevice/oss_enc.c +++ b/libavdevice/oss_enc.c @@ -43,7 +43,7 @@ static int audio_write_header(AVFormatContext *s1) st = s1->streams[0]; s->sample_rate = st->codecpar->sample_rate; - s->channels = st->codecpar->channels; + s->channels = st->codecpar->ch_layout.nb_channels; ret = ff_oss_audio_open(s1, 1, s1->url); if (ret < 0) { return AVERROR(EIO); -- 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".