From patchwork Wed Nov 20 14:54:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16349 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 72D78448946 for ; Wed, 20 Nov 2019 17:00:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5089068A8A6; Wed, 20 Nov 2019 17:00:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E01868A706 for ; Wed, 20 Nov 2019 17:00:16 +0200 (EET) Received: by mail-pf1-f193.google.com with SMTP id b19so14355229pfd.3 for ; Wed, 20 Nov 2019 07:00:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/hCDL/oDlrcm0Sho7FNCFTWQUAktxr6jbrFL2sdcKWw=; b=FO9JzT4V+F2u5xsTSTqOZmejPsoYTFOeJBNg8JG34EQwn/uEfeM6x7x592HIPrADm8 0IIcS1ezPcrg3St96fjagKrrSoRYtEq7hxSKXxM4YZgdiYKY6ACsDVE9rIknQLO4hqjO 2kMaEyPeXrFi1OaBDi3m95q/NoUpxhxzlZbqiilvasjFOg+mKQl5v8YnS6y+BFxQf5AN LWpYegwz6nVg83vKBt7hI8Mo+kWpSCKUkhDVGVi+efIKVY6fI9CvggoFsej+1DhciBsc PNpN5Hy8YfuExU36aYfJaZ+LrPvBEmeVD3ywYTShnxpn4BvfFGPKY8FIxH7DP8b5Y4B/ R35w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/hCDL/oDlrcm0Sho7FNCFTWQUAktxr6jbrFL2sdcKWw=; b=Ha15aeyvVxzJhztboXEBUa5+laodD1eLw0UBKNpzCdA8EGpEJD9+Rr+IfctZgbDB3A l8AVRyvv58nyA9TR0S3yjNpjaCXWoFBSlDbfpq5AJceo/sIB0uiT3TnZhhM3ONA3sSMH 8tdkb5fI3CDKfi5fjWQqYqnPNoBpsfo/gXLGd+rBp90ZJm0eer6NcUTuZ8i0UssCf2we N6tjs6MyHENoCn+fKhlYKZgdW0zz7WTIqJisIFUfcciroWpnwVWmndN48NS7B6ngv69R QAy2rdxHd8CaLbMvPK8EVqdRy2gvBbMjdLqk6emIlGwtvU00nKZBSwy+Ohtybcpz+fkp n2+w== X-Gm-Message-State: APjAAAXtDPJ2Tr1YpFC6EGUcpwDOMvj2jPhSIHVYdZ18pKWMuS0jtM/2 1MQYQO6JbWwodsqbFsa+0rKK+kP2 X-Google-Smtp-Source: APXvYqwcE6Lny4FxNqVlH2vhju0WduDmmKYyNehFWifP64IFmySzeU+p/Y2oelkiM+fO9yQ55v99ow== X-Received: by 2002:a63:66c1:: with SMTP id a184mr3787152pgc.164.1574261702885; Wed, 20 Nov 2019 06:55:02 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j21sm29951234pfa.58.2019.11.20.06.55.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Nov 2019 06:55:02 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Nov 2019 22:54:56 +0800 Message-Id: <20191120145456.20251-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191120145456.20251-1-lance.lmwang@gmail.com> References: <20191120145456.20251-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/2] avdevice/lavf: change the dumpgraph option to bool type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang dumpgraph option currently uses string types, but actually only requires bool type Signed-off-by: Limin Wang --- doc/indevs.texi | 2 +- libavdevice/lavfi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 92bc65be41..19de11c516 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -979,7 +979,7 @@ filters. Syntax of the filtergraph is the same as the one specified by the option @var{graph}. @item dumpgraph -Dump graph to stderr. +Dump graph to stderr. Boolean value, by default disabled. @end table diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index ca8f05f3f7..0804a62b90 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -47,7 +47,7 @@ typedef struct { AVClass *class; ///< class for private options char *graph_str; char *graph_filename; - char *dump_graph; + int dump_graph; AVFilterGraph *graph; AVFilterContext **sinks; int *sink_stream_map; @@ -301,7 +301,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) goto end; if (lavfi->dump_graph) { - char *dump = avfilter_graph_dump(lavfi->graph, lavfi->dump_graph); + char *dump = avfilter_graph_dump(lavfi->graph, NULL); fputs(dump, stderr); fflush(stderr); av_free(dump); @@ -489,7 +489,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) static const AVOption options[] = { { "graph", "set libavfilter graph", OFFSET(graph_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "graph_file","set libavfilter graph filename", OFFSET(graph_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC}, - { "dumpgraph", "dump graph to stderr", OFFSET(dump_graph), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, + { "dumpgraph", "dump graph to stderr", OFFSET(dump_graph), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC }, { NULL }, };