From patchwork Sun Nov 13 19:07:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 39257 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2049830pzb; Sun, 13 Nov 2022 11:07:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf41fKyPjlvaaL9cfuOLEFNV1JZEaLAMhEJTpH60KpISgp7jeF8tpY3lVcM/KOkYmPy7UfDW X-Received: by 2002:a17:906:344f:b0:79f:e0b3:3b99 with SMTP id d15-20020a170906344f00b0079fe0b33b99mr8133749ejb.381.1668366449107; Sun, 13 Nov 2022 11:07:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668366449; cv=none; d=google.com; s=arc-20160816; b=Td59NtewlgVVHZPN7jfUdJhy5Q1p/2/0EngBqOJNCP8ZvruyoJlflYKBg7p8rdkhzc VxeolbdFRX/qNyw2Jd0mtM/ETnQWClajWKNeC5OMWo9BzqXECqVYBZrBEB/MRH8/WKPO ysvE4IAPhqfDSFhHS4RYGi6YXm8oY8GwVBqcJVzfnzLEaa7nGPsbIHENxpTupTfVWjX5 esHREOflsrr8HjKcQMNX7zWg0FtCgZF2F01zHhxNWFoSL0X6hHILJkCBHZSiauvwJgTW BzfAKs0ho8RCNR+hWSADvFxKnJmQlUZl9twsGIrNPrSzle2U8K2jpRFa00RbFkUdP9Um 5Lhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=YBaffb64qHqsTuzyTxDu1f3SiXsQqMpBO2f7A0DKd+E=; b=TaKlnRu72JjhVq09HkjhVsnKuisEFVW0PX81uJRyLt6RXROCkNG5MCQ6doLCyVo8Jh lTkRgA5Oq9sPYqN4BIZrpdrYb1HnIWkIohV/CDj1W1eDq1yrodpEkiM50HgPmrDWF/AI sygfKFR0i/u+cGuFLyWXROnC5RpcwkpoqALsKwYqAOZPbvyuP884qfacJjFfgm/1dr85 g2xhjKFwLzjIN+blnyU9CWEDBS8hqRyAF3hoMcDdp1LmQJfN7sCPlKDdJqsF4w24uXPj 0xpTTzYYmXkNfJx4vuwgxzijO3IRMw4drJziKurE3ajErm2ts86Z0aTq3AWtx54fvZbW 9X4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@oneric.de header.s=strato-dkim-0002 header.b=FJIIkNjb; 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 gn42-20020a1709070d2a00b007adb78db1adsi7375194ejc.804.2022.11.13.11.07.28; Sun, 13 Nov 2022 11:07:29 -0800 (PST) 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=@oneric.de header.s=strato-dkim-0002 header.b=FJIIkNjb; 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 692F868BB01; Sun, 13 Nov 2022 21:07:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDD8068AF54 for ; Sun, 13 Nov 2022 21:07:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1668366436; s=strato-dkim-0002; d=oneric.de; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=DuRTZK7v1N+xmcQnoVcPRrBiv8f12X+FbIFiuREngYo=; b=FJIIkNjbaychj7pspcRkve3CXEjD8MQfU8fnpk67VBIGtoQpUPYIEfEOfysupLwAyJ vI5dXlsLvNsYUnK/p7DrSUrNB4dhpdPRxhSGXnxPDCW+LtdL5s7C2TRMGI4pg93t5Rkm yZgCk2g87aEA/Jr/p7Wxcj2zAz9sfe9lx5M8wlIPC83jymjrVkKj8xrMbFMcH37ZKJmT d2cJyDQ2t4JWWYtWmVtOgs4hvTPjufgwe0iNdl61YO6snw3y8PUxwMyxtPg/sbDk2rTX 10048nbp32fYBBj9YOFXd3gAID2LwOUglAd9vCSghkuh75XaPCYByP1oGTNYAZogAZfT r1PQ== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyYHd48hugDaTPD0scTjgixgxauA" X-RZG-CLASS-ID: mo00 Received: from koenig-desktop.workgroup by smtp.strato.de (RZmta 48.2.1 AUTH) with ESMTPSA id V28b60yADJ7G27i (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Sun, 13 Nov 2022 20:07:16 +0100 (CET) From: Oneric To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Nov 2022 20:07:02 +0100 Message-Id: <20221113190704.15518-2-oneric@oneric.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221113190704.15518-1-oneric@oneric.de> References: <20221113190704.15518-1-oneric@oneric.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/ass: fix comment 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bTlCEgU2+NkM There is no v4 ASS. There are versions 1 to 4 of SSA (with only v4 being supported by softsub renderers), ASS which declares itself as v4+ or v4.00+, and the rarely used v4++/v4.00++, which isn't fully supported by libass. As reflected by the [V4+ Styles] section header, FFmpeg uses ASS, not SSA v4, so adjust the comment accordingly. --- libavcodec/ass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 728cfb1ab5..fdf55f36ca 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -44,7 +44,7 @@ int ff_ass_subtitle_header_full(AVCodecContext *avctx, "\r\n" "[V4+ Styles]\r\n" - /* ASSv4 header */ + /* ASS (v4+) header */ "Format: Name, " "Fontname, Fontsize, " "PrimaryColour, SecondaryColour, OutlineColour, BackColour, "