From patchwork Wed Feb 15 09:45:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 2561 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1873274vsb; Wed, 15 Feb 2017 01:45:40 -0800 (PST) X-Received: by 10.28.88.6 with SMTP id m6mr7121703wmb.4.1487151940487; Wed, 15 Feb 2017 01:45:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q6si4328448wra.224.2017.02.15.01.45.40; Wed, 15 Feb 2017 01:45:40 -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=@gmail.com; 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 B67D3689A38; Wed, 15 Feb 2017 11:45:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2232E68990D for ; Wed, 15 Feb 2017 11:45:25 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id i10so30544121wrb.0 for ; Wed, 15 Feb 2017 01:45:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=MeI1njJYjyXcEJoPb+VAL5ilRt3aeWMvDbY4tRjuju0=; b=LIRKINLYnnAruI7PxWKK0aCE/oxCu6e0ij6k0LhsHuLCdNXuD4GQgnnu3eJl0AFFVq pKHZd0YdGIBeMZRou2DMWpmz7c1nhpg2Zj+oETMvbBabmhuNd/hlUayLvCbKT5z1n3xK xQ+UBX3F6B9ebPIXPWpJAL4i5ambghVoQuHHP6Y+Rn7QQVKAKgSLiV9dOydM2diDEh73 hzMY6NFd/wf6EVeP97k78Tu9EZS3FKH/Xp3HpPTztX/Aekj0lCPWloNBagnmpCFH+jTO 3X/fTo8LZAMuYXW2a0+nJ/6dSGo2TIRU+LZ+W5yD+wm1BeDr0J0OZEOPjn2cIjqkwOsJ Egxg== 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=MeI1njJYjyXcEJoPb+VAL5ilRt3aeWMvDbY4tRjuju0=; b=oah8ARsaZepi+0bMkHYhseJ/Girh6v1mXLrvcCOhvC8lvVKLylbEZvrVpqvdVr3BKc C7YGeoScUXXZ+YwmvI/zJQiFIlu1iRS05JHQV+ecCWENHNoDrMhwbbHk/CvOIJPb0pn6 zWiqVpgsclrcxAItePvXgcAujgSx5sbmDqpVeu0SOtkjSa0H8A21VwKJd+rKjsL6OL4V xeY/RpIf00+Vv43lGWpEhQgJdDRDRTKoq/1y6V1PjLH0FE4kzPT9g4q+n5beqoQ/ZMlz VKUuXagPqxIEu+aUdLTaMNDHgLOtsBbjmOBXJM13STdRQCb/wmuGsNZD/Vw9e3IIMPVm KZ0g== X-Gm-Message-State: AMke39kcTJ4P4ayWS6pLEhKfP6DVUuJw51c6r8th6RlUPMjpqmxRwhaVk+/woccRSF+YQg== X-Received: by 10.223.154.132 with SMTP id a4mr28672607wrc.188.1487151930333; Wed, 15 Feb 2017 01:45:30 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id o2sm4601858wmb.28.2017.02.15.01.45.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 01:45:29 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Feb 2017 10:45:02 +0100 Message-Id: <20170215094502.19229-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avformat/mpl2dec: skip BOM when probing 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" Fixes #5442. Signed-off-by: Paul B Mahol --- libavformat/mpl2dec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c index 59589d5..dfcdf5a 100644 --- a/libavformat/mpl2dec.c +++ b/libavformat/mpl2dec.c @@ -23,6 +23,8 @@ * MPL2 subtitles format demuxer */ +#include "libavutil/intreadwrite.h" + #include "avformat.h" #include "internal.h" #include "subtitles.h" @@ -39,6 +41,9 @@ static int mpl2_probe(AVProbeData *p) const unsigned char *ptr = p->buf; const unsigned char *ptr_end = ptr + p->buf_size; + if (AV_RB24(ptr) == 0xefbbbf) + ptr += 3; + for (i = 0; i < 2; i++) { if (sscanf(ptr, "[%"SCNd64"][%"SCNd64"]%c", &start, &end, &c) != 3 && sscanf(ptr, "[%"SCNd64"][]%c", &start, &c) != 2) @@ -83,6 +88,9 @@ static int mpl2_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_id = AV_CODEC_ID_MPL2; + if (avio_rb24(s->pb) != 0xefbbbf) + avio_seek(s->pb, -3, SEEK_CUR); + while (!avio_feof(s->pb)) { char line[4096]; char *p = line;