From patchwork Wed Nov 1 15:24:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 44475 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c516:b0:181:818d:5e7f with SMTP id gm22csp75059pzb; Wed, 1 Nov 2023 08:24:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+bY/8wWfioFsKjI1g1xqw9aWF7G2aXjmkLXXHCyE/7KAHEdOKTL8GpIzrDbdPBuXamm8C X-Received: by 2002:a17:907:9723:b0:9bf:60f9:9b7c with SMTP id jg35-20020a170907972300b009bf60f99b7cmr2370073ejc.62.1698852291478; Wed, 01 Nov 2023 08:24:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698852291; cv=none; d=google.com; s=arc-20160816; b=Wp9QmhaFUwkx9qlbORVxhg0RO4477O1H6gmIOeTk3aA7Kcp5LlnpQ/t/mGUAd3UD7X PmLBX3A4W3tts4I7Gb10kwiPp7YQTYx01cMsI/ZFCTjGOXzXZHX5bHPiMYSzZM1iow9h iCq3OTGv9DOzY6EMKR6TkXaLPM+4k83p9Abbf6uJlsTw5HzDFdg/3wf8RnFe4fATNz/E pABYG1uv4OO6QfG9zIGMqN70q79fGX3AVDnbjuUljhyPSDyt0Bj2DCmsMpQKpdmpITsa tJp0Gbojl7SkytPQPcFzbBaf/O/vZAoPG+oOtj3to/RLDaYhqaMRh3tMzmPfEZxzZqZk e+uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=DaIRDCM1F8vzTBrvC9u3aekKUMYXyugS8NrVn64ueHA=; fh=FwQN0vYGiAcSjMFA6GiUbxk35kcyHWfeApL09D4ofg4=; b=pyPF5De9M4ACZ9u1Tmyv3GsPKVRv3I9uJ3Y9alpCgFZiXxRgVSYfKEdJHdN4/82LOg JQofacXiHXH0q0xMQ1X25vxAkxC7mDGvlkaSHlR/6afqSwF0yOdzyzKXLiJCwgfwiqp4 9SGoOBkZ3XyfiKm9idAGECtn0FxUYr9cnfBCGb4Wg/4iqUyUJgcN7dXW3QMtTt/Qr36Q SA/ufza5Nz8WCIB9YqAeg3dOCluig51BoAw6jkKHliegVe1zQGao+b9aa2BdWm+YiGgZ bQO1agQ0LxrqC0JnUufyH4NXIIlkF3VE5alWXyfU5tgTNMC2goAgif9wOnqKfsgUITkT EhmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20230601.gappssmtp.com header.s=20230601 header.b=OyaIhlyE; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dt20-20020a170907729400b0098e1263aadbsi44081ejc.100.2023.11.01.08.24.45; Wed, 01 Nov 2023 08:24:51 -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=@xqq-im.20230601.gappssmtp.com header.s=20230601 header.b=OyaIhlyE; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C6D468C077; Wed, 1 Nov 2023 17:24:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CE9E68CAEE for ; Wed, 1 Nov 2023 17:24:37 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1cc3bb32b5dso37414405ad.3 for ; Wed, 01 Nov 2023 08:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20230601.gappssmtp.com; s=20230601; t=1698852275; x=1699457075; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1srG3Ylf3XBirK0gJzej6HgmlVboUXRLqILTTFLgE60=; b=OyaIhlyElI6acw0bPLXA7YDnWmjXnJMDorz2N0y6QWOX/xuMTxQJj6WSqYV91lMYgo 5x4arr2oLqvckP8EBSVy+ESascdq9TYVB4pHYF3Ga4V0mfGdte1Cf9u3eK2B4FQIQxtq je4MSAAugN6AxMNATUbYv7Jgm6wMpjmT2spWHYGvn4TdkYvg+IUpgJp/kGt94wTEW6v0 HATcSxrrU5pe0r6I1yy4Aw8lpniQzxm14NGBvcRIyA1Prq8QpJZ7DjpZ/UKK2nXn4FS1 BhfPgoCVGoUsOe+O7RSuiVSCnHYii4HBZGhw4Z0IcZAxxhzZJyokAz/sVItaJwEz1rjS 9Y/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698852275; x=1699457075; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1srG3Ylf3XBirK0gJzej6HgmlVboUXRLqILTTFLgE60=; b=fD9lDB/x3J38M5VRYQm73ue9ZM4yg6YFfauTpZWjTScpZKmqZryYYroAH83mgxwCuS 2RaGPkoOfmN67+Woq+4JxcO+jj1HLnqISnML0khvDMMl4PT6u+KBkx6mn550a0D0EdkD 11jz6eowrtTU1PLdjwt5TovSwyXBsxA7gtH2mVlZEYsWMQXymlHAFmhx3YrYiboGwxKK TgERr9nqbm1dn6Eabp/xgJ+LyIQvNarvQ9pyvKAR6u6Y3qg4eChadHoAssOdbz93NIQF 5RQg4eJ3QSkARFEu1gkxT+sILpr1DooKgyq27FNMRqSUbig7I2XS2EalVmR510WFZ/9K wesg== X-Gm-Message-State: AOJu0YzoyfV6G8ezebkr4opjEi8u4aX6aIgNRMxR3UV+ijiciG3pYcON vWiNAJkydseFYjfYk41bC2kdNc/nAfR0mGK0kjo= X-Received: by 2002:a17:902:e0c5:b0:1c9:ca45:f86 with SMTP id e5-20020a170902e0c500b001c9ca450f86mr14046487pla.18.1698852275027; Wed, 01 Nov 2023 08:24:35 -0700 (PDT) Received: from localhost.localdomain ([2001:f70:bf00:cd00:590c:f22c:ada4:479e]) by smtp.gmail.com with ESMTPSA id iz2-20020a170902ef8200b001c61901ed37sm1473989plb.191.2023.11.01.08.24.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 01 Nov 2023 08:24:34 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Nov 2023 00:24:21 +0900 Message-Id: <20231101152421.70296-1-xqq@xqq.im> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231101150340.69430-1-xqq@xqq.im> References: <20231101150340.69430-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavc/libaribcaption: Fix mistake in document decoders.texi 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 Cc: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MoPYrAS5j6fL Fix the mistake in the description of `-caption_encoding encoding_scheme` option. Signed-off-by: zheng qian --- doc/decoders.texi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/decoders.texi b/doc/decoders.texi index eb00e2a9e9..f75364166e 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -391,7 +391,7 @@ Specifies the encoding scheme of input subtitle text. @table @samp @item auto -Automatically detect text encoding. +Automatically detect text encoding (default). @item jis 8bit-char JIS encoding defined in ARIB STD B24. This encoding used in Japan for ISDB captions. @@ -403,9 +403,6 @@ Latin character encoding defined in ABNT NBR 15606-1. This encoding is used in South America for SBTVD / ISDB-Tb captions. @end table -The default is @dfn{ass} as same as @dfn{libaribb24} decoder. -Some present players (e.g., @dfn{mpv}) expect ASS format for ARIB caption. - @item -font @var{font_name[,font_name2,...]} Specify comma-separated list of font family names to be used for @dfn{bitmap} or @dfn{ass} type subtitle rendering.