From patchwork Tue Jun 4 05:38:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13396 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 4EDB34458E3 for ; Tue, 4 Jun 2019 08:39:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 348E5680ACC; Tue, 4 Jun 2019 08:39:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F39CB680A03 for ; Tue, 4 Jun 2019 08:38:53 +0300 (EEST) Received: by mail-pl1-f178.google.com with SMTP id cl9so2771169plb.10 for ; Mon, 03 Jun 2019 22:38:53 -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=cuUe/WWZB6Y2k7oh3n9U8MvAu1pKHpSZimAaWgzl1W5D1JfJuZr9LoPNJyDqVtMelE OnsBxSDjbq0x4fURdsxG0ALidcmKMUpsclPW1VWmvIAafrS+xg7avNNq7qtNA6GNh3FF XRcsxvM+tKkGwSVN5FjoqWRqqk042vcVIdS0kX9+46iwWVnoqMwQrNqW01706ptyWZXH ojLCYN19jmHF6guRBCdVcNOkmv+Nhhx1ROmnGd1SIA2FxoXnwBQcCAkEfyMi+z1USc/W Iw4XK5spuyfO1BXVtMmfPGsWtPFwtQWd6FpRLdDL1qjfeDu5sWIY/RYh0Im0qpf3HPWJ waKw== 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=Qcll9Emy018LUH5elfgRgr/Mm3cq8YRlgmTj73TJkmHsmfr7IjIUGsYHckVsAe0fcA bThCnTgujbjVf30uU8uppm/C5/5+MGZZXAk2h/ZmZrmDMY9xEqDCiSzWIWp9ycIkBqG3 f22hyY1n5US+Vg+SF+IQvR/uQ/fRWrcnzzsVw1Z0bh9rtz6BbO3CXbqGqRUIPEx/ibLI MwqDIaYTijpQYeUSM9Bq4ozU97cgRrG2j+XJhVMPOlzFYZhVsSHYBFndGvNpC5W29RoL LPUMa6EUxNgr8KGDaUVT5w3jBsgurcdMeKqzGBm34HAjEeu1ICaXaJktl4nBBe4hmTSN fw3w== X-Gm-Message-State: APjAAAX3rUsgUn5PRsFjlo39Bgitos6TPTGs/FbkhkMXYQUoR4jGC2kz ktqeIVdCB/03nybsUilJ6sSTfXzb X-Google-Smtp-Source: APXvYqwiiF8DsgzvlxOI/kuMY3+ay3nmxUC9m6tYOHQ6odBvloiMYTkAQbAI6jkMwR7oKpgvtW53NA== X-Received: by 2002:a17:902:934b:: with SMTP id g11mr21657450plp.245.1559626732143; Mon, 03 Jun 2019 22:38:52 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id d10sm18180854pgh.43.2019.06.03.22.38.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jun 2019 22:38:51 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2019 13:38:41 +0800 Message-Id: <1559626724-16376-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1559626724-16376-1-git-send-email-mypopydev@gmail.com> References: <1559626724-16376-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/5] 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 } };