From patchwork Mon Jul 3 11:43:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 4199 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp9290584vsb; Mon, 3 Jul 2017 04:43:25 -0700 (PDT) X-Received: by 10.28.29.9 with SMTP id d9mr13861359wmd.39.1499082205580; Mon, 03 Jul 2017 04:43:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499082205; cv=none; d=google.com; s=arc-20160816; b=UWZQfTG5mRwckvKn+oIH46lfkorJmZbf82JjElzC3ro1rgAhr3om0ZuPRKiuvkpx3p nVBHtCeopsn4un6XFltvBmG3rkziLzxh49aaJ3jHE1tc6gg5x9Qi7Ylp11H+EaMgi2g5 HJFgWj18cRWb8ECXh30xKtO4KA0byA5/pu1lHlWl3Ojd0ijG/WEjbncbkPq/PKkk2zXL D3mNbQdamN1zWl2SYyL/O8kiRQ+HJsUiAh8dBiZ7kpdhh2MSU1YCrwfLwxrMCNBOrKlX p4II34SXkCblC/SSts3KFVwUNIO4I8FwpAWGmEfIrcgKqx8cm9AEkxohOEuC228ORYw/ mETA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Yg0r/7gxTJesreZTm68ZUF70qGv4Fx0eM3xDjVJr4e0=; b=t+Yb5TBHb0OtpOsupmq7e7H3rPg+1pjwIWExo6SaMV1F5KnWaag9lz1Mwuc5CzC6fb dzEfsWF6WA8Xy3edVwcRpKmLAEH8aV1Ewm4aiHuJrp/ZZ9gRG6min2/FLL9It8S8FebS hF1Ibn6y+t2i3BDK0/qQ5+y6wvL/G1VvR4kHbamoa+h/0C1TaV+9bXiukZBLzrr0lMHE Fv1viw5FMBuc+HDrUM0pp9oPPSW6UKbsN2ifnwMJ2PegNT3Rvso1yMvlvnn6YWMzf8rL bar+r+8cotJIr3OGpEcSj5sXJRqXtSBlYfJAOoVQ4CQTlWcJjRaU/R1o93Ma+730n92S 6c2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.b=bmFJnKlX; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f75si5848031wmh.18.2017.07.03.04.43.24; Mon, 03 Jul 2017 04:43:25 -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=@googlemail.com header.b=bmFJnKlX; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D82B6882BF; Mon, 3 Jul 2017 14:43:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91833680988 for ; Mon, 3 Jul 2017 14:43:13 +0300 (EEST) Received: by mail-wm0-f46.google.com with SMTP id z75so37475186wmc.0 for ; Mon, 03 Jul 2017 04:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CcQ0/3fUazOhQusNbhZ9mnl3+8lHGTG0YKID4EoYTFI=; b=bmFJnKlXEj3JdZUbDTKNZ2E10/K5g5ZjhrOZi6eOvCj+nN5ZDELo17ho5JitlA8Nrl HIQPfk2QKGNTFE3nrN0uis1zlChOI9SXIcd6YUVj+vqPLaswbjxclK1kH+f9lE48beQQ m+jzsNfI+nyzs1UsFj54y1hye7cUkaGtwFOvNfxBsKeB7QRBLYXc6JPl1Wf9zpegwDhG KJeZnqKMO5+UsIc7dYCfKuD19dOxS26pazYzOjon5eWAtLOvi24lxhtghntwwHcLNuZ4 zbB5lWuk5hJ3lken0QsRXu1pAtc+R+PMIPwYH+p4O2VcpeGfBbSd3+w0irBDi/JTQ1qo gTLw== 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; bh=CcQ0/3fUazOhQusNbhZ9mnl3+8lHGTG0YKID4EoYTFI=; b=JOjbWi+KqiHNr+OQYCdTD32jCUFNli/ddRgLi/brATeHnRvn7l4rLosEvNdFQiRURf ZOSIfTd4f4trt4htTLwo4exTavn6i09Lk6uL1liPj0cp+oykSmbxYu254VL0swTz1lW8 BO7A9CCcPFdt501lWN3kCj38pIpy9icLApIr7ONfUgNq8mIVxlOG31t/nG2vxqY/+e3V U7aAPVNNg4U5+pGk0SMaWzYB1a17NbNvKmp+S7GYFKpQopAlgWTy4AuA6gIwbkbDqSVt 64+22McjcBB6YIbfDhW8UzfIT9s2cIVApi+uEs+siQfYbgK4WVsmAQimazWy9oyB3BTa yIAQ== X-Gm-Message-State: AIVw111MNeUf8eK5Meh4aJaES3MrItITqapeXBD2I5MEutIkgNmprKve JzUqdH5137aiYN+v X-Received: by 10.80.167.65 with SMTP id h59mr5689294edc.142.1499082194293; Mon, 03 Jul 2017 04:43:14 -0700 (PDT) Received: from localhost.localdomain (p4FF0034B.dip0.t-ipconnect.de. [79.240.3.75]) by smtp.googlemail.com with ESMTPSA id s4sm7464585edd.28.2017.07.03.04.43.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 04:43:13 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jul 2017 13:43:43 +0200 Message-Id: <20170703114343.4141-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] htmlsubtitles: support
tag 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some .srt files use this tag. (An alternative implementation would be correctly ignoring unknown tags, and treating them as whitespace. libass can do automatic line wrapping.) --- libavcodec/htmlsubtitles.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c index be5c9316ca..fe991678d5 100644 --- a/libavcodec/htmlsubtitles.c +++ b/libavcodec/htmlsubtitles.c @@ -167,6 +167,8 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) } } else if (tagname[0] && !tagname[1] && strspn(tagname, "bisu") == 1) { av_bprintf(dst, "{\\%c%d}", tagname[0], !tag_close); + } else if (!strcmp(tagname, "br")) { + av_bprintf(dst, "\\N"); } else { unknown = 1; snprintf(tmp, sizeof(tmp), "", tagname);