From patchwork Sun Mar 20 20:06:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1128758nkc; Sun, 20 Mar 2022 13:06:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCVfut2d52i3P4C2+lQXOtml+luYoCyRONeVYgXMRzICPrAQp5vohekKKJ9XjcStniHYd9 X-Received: by 2002:aa7:cdc9:0:b0:419:197e:14d9 with SMTP id h9-20020aa7cdc9000000b00419197e14d9mr10908353edw.375.1647806815113; Sun, 20 Mar 2022 13:06:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647806815; cv=none; d=google.com; s=arc-20160816; b=wF6+ROGwObsjsbkfBpOnUwpr+Hxpk4xJG/HzcTl+goaZooTwez3mYmBPdpGTSYbUZs 7GFUDg1P/3eZ+MeYwiyxo+FKe1C5xQm4ABhGe60IvUf8+QrjclC7rRbyv/kK/eFpDWWs yUKBJ1EIq8AOmofHfMwebRkaW+6ZAHrNI4J3ps/BaPnQWTd/MZ/kd7BLCTROrQ1on3mI L2jz1ygfCjFpEqTcG9vTI6noul7TiLwl0tQK0qBr1zdVv0odaGkrSpgXp0JpLrDsl4Za vUrteIEtnwXHyP3yqKa9ki7c6pzDNki9jRm2Ar4BXhhgXuU2B36KFLLuhOUldGRxBr8x YDHw== 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=Xhs0Qj3DYh5h+lt/0PqZKxduAOPsIrYjDwaeQ2PHnDE=; b=LrY80Eaza/fK7o6+ATFp89ZE029s6nOs0qKE3Fvgqbpd13B8OVlNeXQ4PSuMok18v4 xghpe1/YqtejocgeoUxtHCS4ViEyVi02TZIuy4dw8TtSvSYGhuc0Yms+loPS7mJBZwoj muoXgjMnhWaPAAWBeQD7DvSvkuvDNpcC3a4UutryNk4YGc0Tk/Cm3WGmejBGvlHrDvmw fKW3kW994nDnJaC3mj9FQD9IawLeO5cDKmWJwWATWXxoiDF0nLIQWTObPIjn0zjVatJ6 WvgmVytyPuF2avGmSZeIOfl3B3z9lLuFdHG3ECU55/KyTckqF+UFknlX4IF6Do5/5DN0 FIJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=c1azgfT1; 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 g8-20020a170906520800b006df76385f49si5879730ejm.1001.2022.03.20.13.06.54; Sun, 20 Mar 2022 13:06:55 -0700 (PDT) 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=c1azgfT1; 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 5BB8B68B14F; Sun, 20 Mar 2022 22:06:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E54068AE62 for ; Sun, 20 Mar 2022 22:06:46 +0200 (EET) Received: by mail-oi1-f180.google.com with SMTP id q189so14372799oia.9 for ; Sun, 20 Mar 2022 13:06:46 -0700 (PDT) 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=UFFgb0s9MSPQlnFLdCbkCQVdihLq6/24pcVpQXCz0GQ=; b=c1azgfT1RFwEi5x2Fz2QQ/Wl4x8JA8wK5bevMIH1w9ijZKilbwgoMk77NOVC4FDaY4 5S1K4BIG5+9cpximr1KNhrReJ/uIMPvJFfPVSMTdYmKrdeTzsKiUG1i2Jan7Gvh+T9ow IbEGC5g2RlMlrvgyAjV1mFCjECeKj8W6ltn5TXgsjsCFmDIFVJMCUuBKPnPp4xAQJFi5 aotLVKXNyuLOY1uDTKgkvis2xfOl17GMbo0uaoiPrWXHojvcEpXziKZSk9DROWW1xt2/ WCTZMP8IdOSzEIUP75wa+zoZnPQoPDV8G2aFAxDYVmKXq/cnN9nykD8k+UP9D6N8IEKi T3NQ== 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=UFFgb0s9MSPQlnFLdCbkCQVdihLq6/24pcVpQXCz0GQ=; b=YlCLBO6gWX64uVAQe6JQurstSmPkDEHuiR0+B7C1zKfhnT2bUDFFfPEF4hM39IUIt1 l+/HcD1RhiAQNZAVKYMAgfmCVBO7i/heRBPYcKQZI5GInYb1XxZbvTa3QtaDZV/qLhDI ZDuiMTbeHk4ADmSHe0MwcTf0cPhvawESj7YqsvvW183AmGocu9rYKJrk/UmopNc7zHhy SIUu3ZffOuZ5upl2XBzLlAOsVlnU1zYAYRCK6dMllENYF3brJQZFmiGiltHPWe7vICAv +05A21n84sEBcD+22wyuM8wcTZufsKBfRjYv3lQu5Xuu5/PJh+jBwsq5sAzEWSZdHgsk S7nQ== X-Gm-Message-State: AOAM530Xv3BECSkyl61+e1wHTG3qcUW5HiOCyPPX6Q+l5dY09gypn/3D sA01eW6MEX8vM/yFTXZBjQrD6L+2DnVNGQ== X-Received: by 2002:a05:6808:23c1:b0:2da:30fd:34d9 with SMTP id bq1-20020a05680823c100b002da30fd34d9mr12292166oib.203.1647806804596; Sun, 20 Mar 2022 13:06:44 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y66-20020a9d22c8000000b005c943ff75dbsm6375203ota.7.2022.03.20.13.06.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 13:06:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Mar 2022 17:06:34 -0300 Message-Id: <20220320200634.51420-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] ffmpeg: make the ac option set the demuxer's ch_layout AVOption 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: 8SVntBfXGYQz channels is deprecated on all supported raw demuxers. Signed-off-by: James Almer --- fftools/ffmpeg_opt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 720a3cc46a..b3edbf9885 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1122,7 +1122,11 @@ static int open_input_file(OptionsContext *o, const char *filename) if (file_iformat && (priv_class = file_iformat->priv_class) && av_opt_find(&priv_class, "channels", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ)) { - av_dict_set_int(&o->g->format_opts, "channels", o->audio_channels[o->nb_audio_channels - 1].u.i, 0); + AVBPrint bp; + av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC); + av_bprintf(&bp, "%dC", o->audio_channels[o->nb_audio_channels - 1].u.i); + av_dict_set(&o->g->format_opts, "ch_layout", bp.str, 0); + av_bprint_finalize(&bp, NULL); } } if (o->nb_audio_ch_layouts) {