From patchwork Fri Jun 16 18:23:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Shulgina X-Patchwork-Id: 4002 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1411204vsw; Fri, 16 Jun 2017 11:24:30 -0700 (PDT) X-Received: by 10.223.174.194 with SMTP id y60mr8981057wrc.155.1497637470392; Fri, 16 Jun 2017 11:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497637470; cv=none; d=google.com; s=arc-20160816; b=CR6ML2zWjM+h0e/DPgxTLFXcMPKPbNN5IS/JMnaPG93+DHUPkIrqrFjvfnX/CKyP/C W+uYE6uMfYjdpKWaXH+Q+CXoFrlwcOhGK7S71nQBc2gOORuOu+MOt06r2Q1O4JEj8z7E tSnLQ8xzKdjNlROjTkkfOOdHUeci1mN1UqCM05spuyPPvOMLGyvspdwi47TPayQQhcIT WGZCRLmZKZwP/VwpyCwjHtE6IBwk1AFTcO+l+Rz5R6CLxYL4ZjarJJScfWCFJaX++yxK vXuSjrpR2VD/keC0RebrFtXfoZf083NcjwQDxGeNeEGQ0yzYs2YipBA70qQZBPA6d86I DLWQ== 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=3jiJ9WMHxO/s9wW3PJSvVN9XXGdAiYkBt5e7HqXbiAw=; b=EtXWIhQUkkHKGDb81bPorfe6XwODUeIB0DOXzlJytEyk8xyndrduCooZDdltBw38Qe vo2IpXTQiK10yqD7e/PbQVNThbAbdvbfg4gOH1M5c2bIx4Zhe4I02vS2OlAC71e+zTdi xJ3tJ3HJ5dNo61Bt3cRTqj+pMlirusb9sJ9gCFNgpDxJsLmpOKSEG2aAj2Y+NOAqRRwO DQbL3nMu+r8yXRId9EgLjtY0lhyhBoxQBbvJILcNdod36R6AUlHAXxW1aiG8DqOeD7nM lC8mQ1veekvlKbuKik5ZdZ17fMZ19/paYXdSiQnBu2cJ43y4oSwKOBkpHiyoRmAl3ym3 JZRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=upxar4OB; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m70si2947661wmd.144.2017.06.16.11.24.29; Fri, 16 Jun 2017 11:24:30 -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=@gmail.com header.b=upxar4OB; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D97C568A310; Fri, 16 Jun 2017 21:24:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51090689CD1 for ; Fri, 16 Jun 2017 21:24:16 +0300 (EEST) Received: by mail-lf0-f67.google.com with SMTP id v20so4951864lfa.2 for ; Fri, 16 Jun 2017 11:24:20 -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; bh=xXhQ4u4MijgWnaA3R7LLc8grTuHT17YIlX+Y1/l2ep4=; b=upxar4OBv8B2OrnisqG0NyVlut0G+4tSFNgfV4agz9+KM9F7YTV1pb7OrxvBfgvgSx LsTMxE1rNlypSJw9kJVQ6tNDv1EkQgVlDIGOxLOyQJlPfKK45LdfTKo4kCwLDnuAVeKq feX81FUfuzL9sn8C9B1yjQkUFz0EBQNEzn/BtlUV9uMoVwJq5atx2itZwBet04+BN0kE 2rLGP39CtsfXE5fkZmma2DeigJHNXZMMT+Ey/cOkTRGE8O5UTNhm4qkU0oj+Ss5db13C HGM92eg9+xj4lK96PZ99ViqYCGQ4Q4gX4j+VBqzW4RzKxYkpHq/FKGkpj4ZlA7x+JyRx oMYw== 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=xXhQ4u4MijgWnaA3R7LLc8grTuHT17YIlX+Y1/l2ep4=; b=j66qPxriNPtIXjkinPoZkEXTq+o+BwCzzrark32GzAo1Sxk3OQS+jeqgRwLvLTFFPu XFlMvj34N5/lPhkWg8tVxSWfqj/D+oW/SuOojAjSu7DtQYv2xKQHsL6TgYQlRpW3K53z PskZSybwAjtHGbnoLGwFuuiroIaMcR9PNiw1MHLpGo5C+JylkEjdleTx02umGfqHV619 eslXssdZYRcreaMB5Tt9BmqsVSOhYwRxTPscTYbOVE/9qjKUXGCufePDd5BMzdO4JQBr KKv3ef/ZH3vOxRjtYKVPZiEC4R0LBlzbXErhCxvR/J5aOwz2c+HX/xEDsHRmFSRBxEEx cvIg== X-Gm-Message-State: AKS2vOxxM+ChxkRUzTGE5E0D45k0FJYQnl9S0s+6bBxQO+l8xpNEoN2u 41GexSfdXphAqlrH3To= X-Received: by 10.25.94.5 with SMTP id s5mr3923299lfb.179.1497637458898; Fri, 16 Jun 2017 11:24:18 -0700 (PDT) Received: from localhost.localdomain ([128.140.199.0]) by smtp.gmail.com with ESMTPSA id x74sm770169lfd.64.2017.06.16.11.24.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Jun 2017 11:24:18 -0700 (PDT) From: Evgeny Shulgin To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2017 21:23:46 +0300 Message-Id: <1497637426-4209-1-git-send-email-izaronplatz@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] libavcodec/htmlsubtitles: skip newline characters at the beginning of the subtitle 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: Evgeny Shulgin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" We can have a certain number of newline characters at the very beginning of the subtitles. We must skip them to get the correct result. --- libavcodec/htmlsubtitles.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c index 16295da..b144aaa 100644 --- a/libavcodec/htmlsubtitles.c +++ b/libavcodec/htmlsubtitles.c @@ -62,6 +62,9 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) strcpy(stack[0].param[PARAM_COLOR], "{\\c}"); strcpy(stack[0].param[PARAM_FACE], "{\\fn}"); + while (*in && (*in == '\r' || *in == '\n')) + in++; + for (; !end && *in; in++) { switch (*in) { case '\r':