From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 014FB48789 for ; Wed, 17 Jan 2024 12:42:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 708D368D07D; Wed, 17 Jan 2024 14:41:45 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 869EC68D023 for ; Wed, 17 Jan 2024 14:41:36 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=P7INS7wb; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id E45B714E4 for ; Wed, 17 Jan 2024 13:41:31 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id CQPtiqWtMD5k for ; Wed, 17 Jan 2024 13:41:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1705495289; bh=S3eZwupRd6k8lbLVpBYckInE6GxUITx3wjGC31T8Fzk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=P7INS7wbryWfsC4C3wQXWD7D3SLfsOMLsGF2ZEprx51+LBSGzGjSuxIapLvYcRZ6N hGfUJ4axyAwinkI6GWmZ4FEtxP4mVWTcPWZ5NSAZzVcvKul5YQhGtu8RHPZ2jjimdM UIKYORvuVW2pRB+MpQMP8Dw97d/0zZTmhW08IymJ5DZbm1pOHqOjgPM7I+reFHccK8 qmBEzTw3QUbegpxlu8D2R9qD164cF2qxcJIiOR74wxlgMUAcs7CY1J8uLacGT1NnDg 3q0BDJdQqWbbvyaALU4xEeoZaLI6c2SYHQbJQz81d/WQPGUNP+dwWwwVfMSHoZUEO9 w75+Rz9DhtlEw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 9EE3519CE for ; Wed, 17 Jan 2024 13:41:29 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 93C3B3A0219 for ; Wed, 17 Jan 2024 13:41:29 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Jan 2024 13:40:35 +0100 Message-ID: <20240117124036.7877-8-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240117124036.7877-1-anton@khirnov.net> References: <20240117124036.7877-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8] fftools/ffmpeg_opt: improve wording in option descriptions 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- fftools/ffmpeg_opt.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index bdb71d4283..6ff1cb229d 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1476,7 +1476,7 @@ const OptionDef options[] = { CMDUTILS_COMMON_OPTIONS { "f", OPT_TYPE_STRING, OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(format) }, - "force format", "fmt" }, + "force container format (auto-detected otherwise)", "fmt" }, { "y", OPT_TYPE_BOOL, 0, { &file_overwrite }, "overwrite output files" }, @@ -1494,11 +1494,11 @@ const OptionDef options[] = { "allow recasting stream type in order to force a decoder of different media type" }, { "c", OPT_TYPE_STRING, OPT_PERSTREAM | OPT_INPUT | OPT_OUTPUT | OPT_HAS_CANON, { .off = OFFSET(codec_names) }, - "codec name", "codec", + "select encoder/decoder ('copy' to copy stream without reencoding)", "codec", .u1.name_canon = "codec", }, { "codec", OPT_TYPE_STRING, OPT_PERSTREAM | OPT_INPUT | OPT_OUTPUT | OPT_EXPERT | OPT_HAS_ALT, { .off = OFFSET(codec_names) }, - "codec name", "codec", + "alias for -c (select encoder/decoder)", "codec", .u1.names_alt = alt_codec, }, { "pre", OPT_TYPE_STRING, OPT_PERSTREAM | OPT_OUTPUT | OPT_EXPERT | OPT_HAS_ALT, { .off = OFFSET(presets) }, @@ -1517,17 +1517,18 @@ const OptionDef options[] = { "set chapters mapping", "input_file_index" }, { "t", OPT_TYPE_TIME, OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(recording_time) }, - "record or transcode \"duration\" seconds of audio/video", + "stop transcoding after specified duration", "duration" }, { "to", OPT_TYPE_TIME, OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(stop_time) }, - "record or transcode stop time", "time_stop" }, + "stop transcoding after specified time is reached", + "time_stop" }, { "fs", OPT_TYPE_INT64, OPT_OFFSET | OPT_OUTPUT | OPT_EXPERT, { .off = OFFSET(limit_filesize) }, "set the limit file size in bytes", "limit_size" }, { "ss", OPT_TYPE_TIME, OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(start_time) }, - "set the start time offset", "time_off" }, + "start transcoding at specified time", "time_off" }, { "sseof", OPT_TYPE_TIME, OPT_OFFSET | OPT_INPUT | OPT_EXPERT, { .off = OFFSET(start_time_eof) }, "set the start time offset relative to EOF", "time_off" }, @@ -1551,7 +1552,7 @@ const OptionDef options[] = { "set the recording timestamp ('now' to set the current time)", "time" }, { "metadata", OPT_TYPE_STRING, OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(metadata) }, - "add metadata", "string=string" }, + "add metadata", "key=value" }, { "program", OPT_TYPE_STRING, OPT_SPEC | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(program) }, "add program with specified streams", "title=string:st=number..." }, @@ -1659,7 +1660,7 @@ const OptionDef options[] = { "set profile", "profile" }, { "filter", OPT_TYPE_STRING, OPT_PERSTREAM | OPT_OUTPUT | OPT_HAS_ALT, { .off = OFFSET(filters) }, - "set stream filtergraph", "filter_graph", + "apply specified filters to audio/video", "filter_graph", .u1.names_alt = alt_filter, }, { "filter_threads", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = opt_filter_threads }, @@ -1751,7 +1752,7 @@ const OptionDef options[] = { .u1.name_canon = "frames", }, { "r", OPT_TYPE_STRING, OPT_VIDEO | OPT_PERSTREAM | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(frame_rates) }, - "set frame rate (Hz value, fraction or abbreviation)", "rate" }, + "override input framerate/convert to given output framerate (Hz value, fraction or abbreviation)", "rate" }, { "fpsmax", OPT_TYPE_STRING, OPT_VIDEO | OPT_PERSTREAM | OPT_OUTPUT | OPT_EXPERT, { .off = OFFSET(max_frame_rates) }, "set max frame rate (Hz value, fraction or abbreviation)", "rate" }, @@ -1784,7 +1785,7 @@ const OptionDef options[] = { "rate control override for specific intervals", "override" }, { "vcodec", OPT_TYPE_FUNC, OPT_VIDEO | OPT_FUNC_ARG | OPT_PERFILE | OPT_INPUT | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_video_codec }, - "force video codec ('copy' to copy stream)", "codec", + "alias for -c:v (select encoder/decoder for video streams)", "codec", .u1.name_canon = "codec", }, { "timecode", OPT_TYPE_FUNC, OPT_VIDEO | OPT_FUNC_ARG | OPT_PERFILE | OPT_OUTPUT | OPT_EXPERT, { .func_arg = opt_timecode }, @@ -1806,7 +1807,7 @@ const OptionDef options[] = { "Version of the vstats format to use."}, { "vf", OPT_TYPE_FUNC, OPT_VIDEO | OPT_FUNC_ARG | OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_video_filters }, - "set video filters", "filter_graph", + "alias for -filter:v (apply filters to video streams)", "filter_graph", .u1.name_canon = "filter", }, { "intra_matrix", OPT_TYPE_STRING, OPT_VIDEO | OPT_EXPERT | OPT_PERSTREAM | OPT_OUTPUT, { .off = OFFSET(intra_matrices) }, @@ -1879,11 +1880,11 @@ const OptionDef options[] = { "disable audio" }, { "acodec", OPT_TYPE_FUNC, OPT_AUDIO | OPT_FUNC_ARG | OPT_PERFILE | OPT_INPUT | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_audio_codec }, - "force audio codec ('copy' to copy stream)", "codec", + "alias for -c:a (select encoder/decoder for audio streams)", "codec", .u1.name_canon = "codec", }, { "ab", OPT_TYPE_FUNC, OPT_AUDIO | OPT_FUNC_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_bitrate }, - "audio bitrate (please use -b:a)", "bitrate" }, + "alias for -b:a (select bitrate for audio streams)", "bitrate" }, { "atag", OPT_TYPE_FUNC, OPT_AUDIO | OPT_FUNC_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_old2new }, "force audio tag/fourcc", "fourcc/tag", @@ -1901,7 +1902,7 @@ const OptionDef options[] = { .u1.name_canon = "channel_layout", }, { "af", OPT_TYPE_FUNC, OPT_AUDIO | OPT_FUNC_ARG | OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_audio_filters }, - "set audio filters", "filter_graph", + "alias for -filter:a (apply filters to audio streams)", "filter_graph", .u1.name_canon = "filter", }, { "guess_layout_max", OPT_TYPE_INT, OPT_AUDIO | OPT_PERSTREAM | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(guess_layout_max) }, @@ -1913,7 +1914,7 @@ const OptionDef options[] = { "disable subtitle" }, { "scodec", OPT_TYPE_FUNC, OPT_SUBTITLE | OPT_FUNC_ARG | OPT_PERFILE | OPT_INPUT | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_subtitle_codec }, - "force subtitle codec ('copy' to copy stream)", "codec", + "alias for -c:s (select encoder/decoder for subtitle streams)", "codec", .u1.name_canon = "codec", }, { "stag", OPT_TYPE_FUNC, OPT_SUBTITLE | OPT_FUNC_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_old2new } @@ -1978,7 +1979,7 @@ const OptionDef options[] = { /* data codec support */ { "dcodec", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_DATA | OPT_PERFILE | OPT_EXPERT | OPT_INPUT | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_data_codec }, - "force data codec ('copy' to copy stream)", "codec", + "alias for -c:d (select encoder/decoder for data streams)", "codec", .u1.name_canon = "codec", }, { "dn", OPT_TYPE_BOOL, OPT_DATA | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(data_disable) }, "disable data" }, -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".