From patchwork Thu Apr 25 21:22:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 12911 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8CD6E4499A0 for ; Fri, 26 Apr 2019 00:23:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DCC868A7D8; Fri, 26 Apr 2019 00:23:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 956A968974C for ; Fri, 26 Apr 2019 00:23:07 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id c1so1018049wml.4 for ; Thu, 25 Apr 2019 14:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=cVzAmSi+tcYSnlXIJFXwcbrmUDnTYgY1+bDWeDGKS7I=; b=k2M2YWk/u29Wfy4v02wZTJhQUY34CS4Z2Pv0VDXqnwyJI9xZX0DQrACRVoBFPUKB1d r4It2A0ZB1A5r7M6lCbRkuilAgSwD9gJFDEYW80C3uPa/9vToOY9ZZ8RmQTOYZ6akZmB eBGKXeQdW/z/FjT4eaQbzxt5KK4uxQER1z/y+4y2Wy0ZaKzYdzPrlKK2+2UxbUGIUtwi eR1FPh9GVXwgakVZ5hvINGjpZEy5Egdgd/XKfrkWpuCSiza3i15yLd9kW6tNd8D9A/dU tHaSleEiX+Hrn6L+DTe6VbRdjU7NxpplFo/PnpCa5s0XOD6KYd3AW9PeKfRb1jjgpvCw Tzyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=cVzAmSi+tcYSnlXIJFXwcbrmUDnTYgY1+bDWeDGKS7I=; b=X1mRVEmpjm4NmF5hBksPTQAGSQe1PeXWB8lzOoQHSh94oFDGyI4FrjBe94a+byqqO7 eGZ4p0C8aG4xkNX/IEPflYTSifVA8ZsFfocC/C27DWp1DUfdv4gQt/axczN/EXX6PMFx auHTYWDLNUe6pOkZ4puxAiW64D1f+PG9uoVviC9gcCuKaAAKzB5amQvlIrVGE1en8BK+ M9TQ11GazSdb5DSphget3n8UpN750wlMJeTR5UHXHamijLQeRf3v4IriTeubiVjz1L/E xGU3tmkcQJp9pMHdI30Khn6LufwAoQc9mY4WUrh0pmLCcBnsPdSBIumJ/A3Tq1HLcnMh U/1g== X-Gm-Message-State: APjAAAVQgx653EoWgjnCKHkHpvzq+ubXVisuOlsno+xz+EnRsqE/flPt cX9NzOArixuwhN+b+z+pQxzW7kqj X-Google-Smtp-Source: APXvYqzFcyJkrBRDljXez0rRFNA6eanRbFfYwWQd/pQV7PPnkATpbfxBgj3hucsDFGnVN+vzABmoDA== X-Received: by 2002:a1c:9ec7:: with SMTP id h190mr5317411wme.105.1556227386865; Thu, 25 Apr 2019 14:23:06 -0700 (PDT) Received: from localhost.localdomain ([37.244.238.255]) by smtp.gmail.com with ESMTPSA id z140sm45942655wmc.27.2019.04.25.14.23.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 14:23:05 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Apr 2019 23:22:47 +0200 Message-Id: <20190425212247.11287-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/subtitles: ignore extra '\r' at line endings 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/microdvddec.c | 2 ++ libavformat/subtitles.c | 2 +- libavformat/subtitles.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/microdvddec.c b/libavformat/microdvddec.c index ef6bcfbc73..598093309c 100644 --- a/libavformat/microdvddec.c +++ b/libavformat/microdvddec.c @@ -130,6 +130,8 @@ static int microdvd_read_header(AVFormatContext *s) continue; \ } \ p++ + if (!*p) + continue; SKIP_FRAME_ID; SKIP_FRAME_ID; if (!*p) diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index 93c9ef05cf..659c99d1cf 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -417,7 +417,7 @@ ptrdiff_t ff_subtitles_read_line(FFTextReader *tr, char *buf, size_t size) buf[cur++] = c; buf[cur] = '\0'; } - if (ff_text_peek_r8(tr) == '\r') + while (ff_text_peek_r8(tr) == '\r') ff_text_r8(tr); if (ff_text_peek_r8(tr) == '\n') ff_text_r8(tr); diff --git a/libavformat/subtitles.h b/libavformat/subtitles.h index ca78db224d..6b418e3621 100644 --- a/libavformat/subtitles.h +++ b/libavformat/subtitles.h @@ -188,7 +188,7 @@ static av_always_inline int ff_subtitles_next_line(const char *ptr) { int n = strcspn(ptr, "\r\n"); ptr += n; - if (*ptr == '\r') { + while (*ptr == '\r') { ptr++; n++; }