From patchwork Thu Jan 13 01:55:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33380 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp26162iog; Wed, 12 Jan 2022 18:13:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6XluUFvziu1nZnVVYBQUC2XztVn8Sfijxtl/q5mp+YrZjiBiuBm+AfLD5+fKJXfXnhSLp X-Received: by 2002:a17:906:e282:: with SMTP id gg2mr1940437ejb.607.1642040039333; Wed, 12 Jan 2022 18:13:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040039; cv=none; d=google.com; s=arc-20160816; b=eDdyj6oiNWeewvWFxwI5PcyiRVO7v7AVV4C8Gxzct61PZKh8fkbS/ln8qbZhcdWwhT fAY+fWez6XAzOR0UrgMtLz/SxTpHZ5LqbQZGRq/fGSXv+q+MBzj0AgQbe026GfVop366 MWzznUs5aBt+/x2wSWLEQ6JRKeF/z6A9naUBjjl7/EhM+hBvQqfwkImre9we7loeCJrt v0LNaWh68vR7JulOscEI1dN/QKs+INpOyBRB8YNCTA09b+eWcUBrTcXy0tPYMsKihCzs OyeyIVEA2u/YhdkLxTQthdF1KYxUOrTqi9xntQVA0P+0Y03v9pXdTxOyowy/MnkxTf/i C4Ow== 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=dQOJtprO6jprGU7zpXVlvocllPdHBS3ftNKkM3NV6T4=; b=cNVxkWSycgpv3CRoCPW+dE4Olo1QzE26CqLTM1D3HQW4r1ZB1moZEO201rRzUdSJzs YU2zel7/zZaOLGrI3oysEoql1ma7nzcmQq6jiuCZVXfgPK4zOMhFT95UYXhfYp14VxeN GxIYv/uWyLjJp6cW2vvvaonlNHFqi3IDHHahZhlLG/l61RuxvFrfJOhhGVRA+pgj7TcN NBhZ8+DYCcXZDSDe+H8iiWlIzzzqS4kcsZtDA8cX77NkQJYCv285n4YBCFwArZxnicUy 7CEFm5q1RznKFXNQBZCbEIFjVWE9DubA7hWOFoaMsIE+0XnoTnQ3oLZ/hSSrKWN8Opu1 mJjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IP1VcCMG; 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 sb1si211857ejc.795.2022.01.12.18.13.59; Wed, 12 Jan 2022 18:13:59 -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=IP1VcCMG; 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 B2B0C68B280; Thu, 13 Jan 2022 03:56:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EE1B68B267 for ; Thu, 13 Jan 2022 03:56:41 +0200 (EET) Received: by mail-qk1-f170.google.com with SMTP id m2so5553244qkd.8 for ; Wed, 12 Jan 2022 17:56:41 -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=uYJDun1maoNCkurZHnLV1113p7gGBZUOfzOM4UFc1ZU=; b=IP1VcCMGad0CkHx6COjonv40jQ50W3IQuTzw4Bg8UX1zMfNbkjZgmpS0X6lUYHdtek 0orK1dVSAaPPacL4IJv2VdFo2uvmrBA4YPpfSXLu9aCjBpDtVH4dw6jEd6HqzRcJiBd3 6ytmgcuPj9Oo/OytYdfQbYY/lRwIPMTDMbyMuH7QURu91Z6SjmMbVEnRUI0JWMqhYNjP N2PXZlQwUpGu+gqfvlDUPijxZD6c3RTiHvuvFEgH1CflqW03KsIfuxl9WbftMwOxz1n+ jJ976XqFifGiEvsYXjnZ7y8ux1FIVfrb4P015lgpDzYRnVfMjUXtKgFTUBX7LYT/WTFz h1rw== 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=uYJDun1maoNCkurZHnLV1113p7gGBZUOfzOM4UFc1ZU=; b=iQ2j2AXUMqxzwJcNp0z5rrq2Jy1d1eNAHbiM44TQJGgiq+sjlKaE+srH0bllMRot/R 6zJWDhIirJjZGX4MURHFliEUr2Q4ND4aX6Jvyaklh5XgnCDWaby18aQR6Utwo51BjSx4 Lk/c11tbxGJ8RlsnhCFuRoq44odM4YDUSuWCWliB4jX5pyBNQjvnbz2Wgq66L55uTZAB f4mzFbXGmfC/FMvxxnueXRBfx0CkdnzGx0xjFuDTlaPZKgEaumU2yA+ZHrAt+McA8R3I O7lNYIdDfqomqkMc6S4Cjw2AvNhuFzqzLL5imfh+o5LE/ryU2HH+15mBw7qP87WecpfR M+hg== X-Gm-Message-State: AOAM533Y5zrxLgL+EHiOjg2mJfw8CmWgnnJJrvUXWCGqDMddIboiJnPf dKaSydvnjcI1c2WvKlzoNGaMQ5oeuh0= X-Received: by 2002:a37:66c7:: with SMTP id a190mr1854519qkc.353.1642038999800; Wed, 12 Jan 2022 17:56:39 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:54 -0300 Message-Id: <20220113015612.448-13-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 101/281] mpeg: 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: 3vaZzL0TERqw From: Anton Khirnov Signed-off-by: James Almer --- libavformat/mpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index ca15d9f241..34c1b74a4e 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -621,8 +621,7 @@ skip: st->codecpar->codec_id = codec_id; if ( st->codecpar->codec_id == AV_CODEC_ID_PCM_MULAW || st->codecpar->codec_id == AV_CODEC_ID_PCM_ALAW) { - 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 = 8000; } sti->request_probe = request_probe;