From patchwork Sun Mar 20 19:36:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34866 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1115179nkc; Sun, 20 Mar 2022 12:38:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoQ0UxcMFgHEQh6HRGuh7C16mw0JWQ75A/SIhs44woECw9r5+PXncwN7lYvTf394mRLUoH X-Received: by 2002:a17:906:4ccd:b0:6b7:75ca:3eac with SMTP id q13-20020a1709064ccd00b006b775ca3eacmr17438208ejt.167.1647805096629; Sun, 20 Mar 2022 12:38:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647805096; cv=none; d=google.com; s=arc-20160816; b=OKFC4uymuv0JVATpdJvhogcMOzffL92lNl+K4JfR8HLMC1N3caBCqRCU9J7r95vMhA BKkgOcDzKSn4WtewT46HY7IVBVUM/YLicNgBbjo2U/gH7aWrDspzmNbCb5EmS+frfbDV Q7hILRBKr94FaDQaUIygVDOqa5egag6pmxR/fIOq2/xbg348VBmixf8WMAYWjeWtsN/0 hn17tL4W9pK9YNACvl7hjbMpqNuQtfUjdFdX8E/GIQoKEmdeJBJ4gRPc8F0WdppxjyfO 8dcIFj0a53z8aRTRdo81eEHFBf3vfk6pW8YgCf2sESm8QXokZTF+rcKKMohmvYD8Ne9C uAIQ== 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=a7AjSTuSZAzAQ/ZIrFqw30D7KIRkgBMrJaB8i3yCE0o=; b=UlRgVS6w9ryIKZ1a3jMb2644KmJAGW6MvcpRUuAsdjsDPwzuTxaPyF/S6y/as+OrRx 9+pFyvPOsbxg9YohMnhnBeaBVfIe23uKVr0Fuqx/Fgdue0rCE9O5NEhSH2WQ2icFFybf QiqoY5tJ3CtevYXXm3hSogKI1Y9jAb4J9Lre2wM0NakXsqNGi6J9ALXbYnd8f1M7OLyj HS1xPnvXMJBmXh1lOXcf6Fc6NPVn/tf4RiFJoHGsOCLPHRNVJmowLgEYJX5WJCrFGvSF /bTy9yvyZxfEqmlquWkPvZ4HHPb9EGyVmaUHh6r8HR6iR6/On39bJXpoP0xMmNoz/ozz 8Umw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fDAK5GVs; 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 f11-20020a170906738b00b006df76385c8fsi5301079ejl.303.2022.03.20.12.38.15; Sun, 20 Mar 2022 12:38:16 -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=fDAK5GVs; 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 EA5D168B18A; Sun, 20 Mar 2022 21:37:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C341468B104 for ; Sun, 20 Mar 2022 21:37:24 +0200 (EET) Received: by mail-oo1-f51.google.com with SMTP id j7-20020a4ad6c7000000b0031c690e4123so16916485oot.11 for ; Sun, 20 Mar 2022 12:37:24 -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=9Deon5LczpImdavzlF/SiHvEi9nD3wkCOR3ytWKNC4c=; b=fDAK5GVsK7ZILO+OXFrpbTOmMMM+rVuPIChJtkBPaWPKZblpsSYIRtpmTsIQeX0Fuf iIXlkJuxOYN4DcZlw/E4BEdjJvh7cOGev6rHezZ3hTvTPF5qVHqsWChwLUiCgLueqqL2 D/M3be0dbEHS8yWmhsGy1iq3tgUFpwFWYWlTYsrVnPZmYlc5WahMElG/a2/GD3//39E5 VRMIeUSiLuFvDNc4jThK9MysmwWd4PAMzeYlaS8WDMHMxovdwMdUXXDI4cf98nIHAe/t i48Fvo9xZQ6H8jspfMRAZLPf2OluehVVC2WQ3Ilj2CT8b2Ca/LiSzz1U/k3C7YTMcnA+ GJwQ== 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=9Deon5LczpImdavzlF/SiHvEi9nD3wkCOR3ytWKNC4c=; b=OCNsWIfS7QDTkPRel5Pez4Egt+8q8n2TZQouzVdodz6+ReOBR48Ns6WvYrzFLBm/kR sT2mGUPRpMiD94HjvIIi/YzOb74tJiswLxJR+Dzlj+8me8l6ddxUFZzUp0FnNmogcoAD K53bm5C+X99JJtUe29tioZzvSxYxx7eONaacqAG74hZCFN1CsKKfFVJ0WZOq83evchit NlPr7jsw7uywPXKwSGkViiwZ/bUM9JRtB6RoRZ3ESZB3N5TO0q2qWeoPAtgnAZEWma7c Aa5YMkd3+Tcf7Ge0SnPWxjRJfkMMBLP0YPkwPQ8GBfQkTxTEVSTEyEKQ1sQM3rkZDsn/ 0hUw== X-Gm-Message-State: AOAM532MII8bJLb2x3CM2k7hQ/K+2G3HJ0Ar+xPCJfUN8ZGnIaX7LGJN KUBeLz7VX71OHuquGu2OxRbHWm9P+p2BrA== X-Received: by 2002:a05:6870:511:b0:d4:52f2:9bf7 with SMTP id j17-20020a056870051100b000d452f29bf7mr6929058oao.17.1647805043152; Sun, 20 Mar 2022 12:37:23 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y15-20020a056870b00f00b000d75f1d9b81sm5418483oae.46.2022.03.20.12.37.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 12:37:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Mar 2022 16:36:18 -0300 Message-Id: <20220320193619.51185-6-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220320193619.51185-1-jamrial@gmail.com> References: <20220320193619.51185-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] ffmpeg: add a ch_layout option as an alias to channel_layout 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: 1Al4NMlfEQN/ This ensures it's parsed as a CLI option instead of the AVCodecContext AVOption. Signed-off-by: James Almer --- fftools/ffmpeg_opt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index f5c759c6d1..720a3cc46a 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -55,7 +55,7 @@ static const char *const opt_name_codec_names[] = {"c", "codec", "acodec", "vcodec", "scodec", "dcodec", NULL}; static const char *const opt_name_audio_channels[] = {"ac", NULL}; -static const char *const opt_name_audio_ch_layouts[] = {"channel_layout", NULL}; +static const char *const opt_name_audio_ch_layouts[] = {"channel_layout", "ch_layout", NULL}; static const char *const opt_name_audio_sample_rate[] = {"ar", NULL}; static const char *const opt_name_frame_rates[] = {"r", NULL}; static const char *const opt_name_max_frame_rates[] = {"fpsmax", NULL}; @@ -3814,6 +3814,9 @@ const OptionDef options[] = { { "channel_layout", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_STRING | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(audio_ch_layouts) }, "set channel layout", "layout" }, + { "ch_layout", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_SPEC | + OPT_STRING | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(audio_ch_layouts) }, + "set channel layout", "layout" }, { "af", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_audio_filters }, "set audio filters", "filter_graph" }, { "guess_layout_max", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(guess_layout_max) },