From patchwork Thu Jun 6 02:07:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13424 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 A82C34496D5 for ; Thu, 6 Jun 2019 05:07:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86B6768A442; Thu, 6 Jun 2019 05:07:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F6F768A559 for ; Thu, 6 Jun 2019 05:07:36 +0300 (EEST) Received: by mail-pf1-f181.google.com with SMTP id q10so466285pff.9 for ; Wed, 05 Jun 2019 19:07:36 -0700 (PDT) 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=MyAFXCv6Q1J/oOpnJc+nZmXObyco0LPnmzd/xKs43C4=; b=eNYFOB+KvZ2nHjJDiSZtmxnjasbCjngvIQbvonpW92wZSuY9F1XGDdbVpQLnxKpki+ Wcoo4jyW6+Cru+8/U0cCRB7yUtEyyqRAvSABfY1tp2Upr5jZXEEGd4tRvtOwzmiUl2Pc r5wgZTpjumlxlRO1u0WEXnAR8R5lA1Ahnc7IH87sAW9ARsyWfP57gvQs8kXev5XQ2FAd WTf1R7J3lDNPIyzaO/bxk4XW7y4QQpiV3AzUDXW8bu56MNQUbp47freIZCOuNpXS8i5a W1amC9TCXuy35B3mgyRFFCo7PsE1u7Se8mIAY5g3Y1p232p0FAsp5CxLjV9bPUqJpdG9 WRsA== 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=MyAFXCv6Q1J/oOpnJc+nZmXObyco0LPnmzd/xKs43C4=; b=ShPQrAQfHHYw6T2x1vMDcdTOg26Mx6DTz7m7cCUe1irARv3PC3LUHxfahiPwXQkVZ+ 4enq13ie7yNrcZMRC3ZO6eIuxd/YvCZajYIolKuSks7QbCrpA4ea4qD9+5KFYsWAGFmh aSh0s2Pm5rzKQyOC9Ow03hta0OEFf6kRLiY3crnVx20aXjoq+7t0KZaKG+tOwaR4ZAtf mWws9mDRbE7I/Pcu4y31/3K1X/AxiOTN519J9n64V3sehRpJRsPUDkWmD2PHLm5twU52 I0E04mF3gBlYCVbkzR+23p9WmDjP63dKmPqAL5EO2XyLCpji62vGGvk26cVwi13DP9UD Wm2A== X-Gm-Message-State: APjAAAUsm04fsymsxtQDRaWvZ0hHOU4l/V73vp7+u2E3x7UGCzA5sck0 UZWsUS9u4AwgHrXqzvFjHBgiYsOs X-Google-Smtp-Source: APXvYqx1h9tCPS69n6bnJTLssFxr2B0ShU6shLn56JiXq88pgMYuqFVZtcURJwuOmp5MsLxiPvZQRg== X-Received: by 2002:aa7:825a:: with SMTP id e26mr51213928pfn.255.1559786854261; Wed, 05 Jun 2019 19:07:34 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id m11sm233220pjv.21.2019.06.05.19.07.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jun 2019 19:07:33 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jun 2019 10:07:23 +0800 Message-Id: <1559786846-30859-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1559786846-30859-1-git-send-email-mypopydev@gmail.com> References: <1559786846-30859-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 1/4] lavf/webvtt: fix ffmpeg -h demuxer=webvtt can't dump options 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix ffmpeg -h demuxer=webvtt can't dump options Signed-off-by: Jun Zhao --- libavformat/webvttdec.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c index e435de3..52579c5 100644 --- a/libavformat/webvttdec.c +++ b/libavformat/webvttdec.c @@ -192,14 +192,14 @@ static int webvtt_read_close(AVFormatContext *s) } #define OFFSET(x) offsetof(WebVTTContext, x) -#define KIND_FLAGS AV_OPT_FLAG_SUBTITLE_PARAM +#define KIND_FLAGS AV_OPT_FLAG_SUBTITLE_PARAM|AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { { "kind", "Set kind of WebVTT track", OFFSET(kind), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, KIND_FLAGS, "webvtt_kind" }, - { "subtitles", "WebVTT subtitles kind", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, 0, "webvtt_kind" }, - { "captions", "WebVTT captions kind", 0, AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_CAPTIONS }, INT_MIN, INT_MAX, 0, "webvtt_kind" }, - { "descriptions", "WebVTT descriptions kind", 0, AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DESCRIPTIONS }, INT_MIN, INT_MAX, 0, "webvtt_kind" }, - { "metadata", "WebVTT metadata kind", 0, AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_METADATA }, INT_MIN, INT_MAX, 0, "webvtt_kind" }, + { "subtitles", "WebVTT subtitles kind", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, KIND_FLAGS, "webvtt_kind" }, + { "captions", "WebVTT captions kind", 0, AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_CAPTIONS }, INT_MIN, INT_MAX, KIND_FLAGS, "webvtt_kind" }, + { "descriptions", "WebVTT descriptions kind", 0, AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DESCRIPTIONS }, INT_MIN, INT_MAX, KIND_FLAGS, "webvtt_kind" }, + { "metadata", "WebVTT metadata kind", 0, AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_METADATA }, INT_MIN, INT_MAX, KIND_FLAGS, "webvtt_kind" }, { NULL } };