From patchwork Thu Jan 13 01:59:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp32965iog; Wed, 12 Jan 2022 18:25:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/bVSXdzdCSbdukFvq5fAJqI6pWjTrMEJxbzDDbF8DjeXU1/owjvDtp0vClb6UvrQKCYeE X-Received: by 2002:a17:907:1c84:: with SMTP id nb4mr1908412ejc.564.1642040711947; Wed, 12 Jan 2022 18:25:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040711; cv=none; d=google.com; s=arc-20160816; b=ZVBp6p77vCCk/yZJi4ssE+0ZpXYufDZxac+URmy/EWGxWv4sgQ9ctcNKjjjSQA3b43 +bbIEhLoj1P3Kd7Z2yJU9Iq1bJF2u1pc1OBIEAdyXhS9ueiV118U1lb/TF1p74d9bY++ KL2akYKnNXwzHfkN1FJn33XTiz1cGcnbrgj7aatz+RvUs6cfc0kIQkA2LrhiYR7cYJQU WjNuNdSBkagmlnHrCVzf6zlM3C7OeXct/TgsmNEF+dhR3AtixXctPQo87XZUD5vGmjN4 icfY9ZroFBt+6hbxz3mnhPhpg3lSkDt4Plt0smtSZyhErqf1jXWonfXyyI9X5at3ioPx l0xw== 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=Y/W8zrqeDTw9VRxOUA3G8qlRhSYyfG7r2ivlEIoYKck=; b=GsVvvwUV2UXMrdjcmYcFvme1qWhumykEDrGBtYxUj4g7AZX5plRBlL+9FTyKU8y8OF dYmWFR73RPSxFIMWkTa2hpoJnZTXeZozEW2XiiO9g9VKE+4oc6lNTDh2SsYAZGzCGtU9 IrCIfSCFnHcmHMBYOLfe7uJcASaS/zQ7SQLqptPKXb4UACE4KeevWQHfVCdDw4dx5OF6 gXKFeJlo7lqTBRk3yH4C931q6QdRXjeVGMiz9zaG6itlgPVqLYBTxpZfdnLWJaORc13f DIQvyZtXDxPG3zp+ND3WgFKLxyEm9BzOrphj7I2Ggio/+aWEfaa4NiNXIsCSddokWsOa t/aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gkcsE1Mm; 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 hy13si692157ejc.297.2022.01.12.18.25.11; Wed, 12 Jan 2022 18:25:11 -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=gkcsE1Mm; 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 647BD68B07B; Thu, 13 Jan 2022 04:01:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55B5B68B43B for ; Thu, 13 Jan 2022 04:01:06 +0200 (EET) Received: by mail-qk1-f177.google.com with SMTP id bl18so5579571qkb.5 for ; Wed, 12 Jan 2022 18:01:06 -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=/Qx0X7lO5Up6Iq7OpSOHI80C2zfAY605LLV7/nL2Xpg=; b=gkcsE1MmLLY6hiSHAbCTah5bfyCtSCb4opydeHB5pn+oRP5+A9WqvwdmiUO3KbAdPV JizJ1/HYuFFIuH8TiYOFF7uNLYiWeDGIZfSUTeig3UOZvFOjmCaSQgf5vWU8ruC3eH4o QBsE7L5pBbEdAM7yio7frqMpj2PZlneRowcrkNBDvsfP7C313uhllzuTYSpOtffAg786 PZwYo2cr+87CX5RpAuMo/2IREZcw7sxqPJBk0rrzL6FJ3gTHAOTh2v/u5kb5EirrWiyo B8pRY35Usc/l8hjQ76kjrsp+ImlLsrHOP8xJpUnSj0nfCWXuqaMjWhakL+T9zWx9T4n6 XiNQ== 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=/Qx0X7lO5Up6Iq7OpSOHI80C2zfAY605LLV7/nL2Xpg=; b=mVwGXuvR/L1i14kqRmIa1DdTeCOJdPgy362AI2wVzr2AhqjiyHUulN5XfJMqlHc0Ag dCNVYhrkIcqiSlT9zlYDCsHidUtNzKyiHnCrWOJ0zqSd+1JSh7/Q/nJ7BZqD36Q1pUKE pBjgSp/ANVWkT7rTM8UtwP7tpoJ8MyjUlpE1BEuaDBE+1ewmyJge8zq7fBHmuZJzVEvo AUpcdr1V8s+QVOVx5sCuhw7m6oh8VNRSqdWd5qYUM0Yk1ZVNaCKfUDFMxDLxbB11JBFN 8rSVNGtoWpVmI7oYnejzhhffZwzhGQElHNafx4YCNHCHRA841m4m7Jn/2NYmv40B7F8/ 09Yg== X-Gm-Message-State: AOAM531t0ooZwzGALdbI2wGj6RfLt1XD3nEMK/1glRZ56sWpa2c6ffjN v9l9sGFNLS39tCLpqHEaJxY/YSG+QgQ= X-Received: by 2002:a05:620a:bd6:: with SMTP id s22mr1811765qki.348.1642039264896; Wed, 12 Jan 2022 18:01:04 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:59:57 -0300 Message-Id: <20220113020026.590-2-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 150/281] sol: 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: mpxlQBsl9FLW From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/sol.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/sol.c b/libavformat/sol.c index 42498492b6..b92cfb36fe 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -113,9 +113,7 @@ static int sol_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_tag = id; st->codecpar->codec_id = codec; - st->codecpar->channels = channels; - st->codecpar->channel_layout = channels == 1 ? AV_CH_LAYOUT_MONO : - AV_CH_LAYOUT_STEREO; + av_channel_layout_default(&st->codecpar->ch_layout,channels); st->codecpar->sample_rate = rate; avpriv_set_pts_info(st, 64, 1, rate); return 0;