From patchwork Sat Feb 11 10:56:07 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: 2503 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp63044vsb; Sat, 11 Feb 2017 02:56:32 -0800 (PST) X-Received: by 10.28.181.145 with SMTP id e139mr28749186wmf.127.1486810592421; Sat, 11 Feb 2017 02:56:32 -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 n132si4746621wmf.91.2017.02.11.02.56.31; Sat, 11 Feb 2017 02:56:32 -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 20B9B689D72; Sat, 11 Feb 2017 12:56:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36906689A65 for ; Sat, 11 Feb 2017 12:56:18 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id c85so10552883wmi.1 for ; Sat, 11 Feb 2017 02:56:22 -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=MFXN2Ty2XhYRGK3+3Z24c93g5Am07T+SwQ62+5bML6k=; b=jyWXa0LV32hT5uZm4v1CUK/N9eqdYridnHGtPNbmPE0iWkAbEJ9I/exY2JuvmQNl/U +LNgHwM+4Vw6B44gX3HdK8I/wCOVYgDYmTJiQGpboAZw3TFOomzNlc7TzcG2w0gCRNJr Zpv805MkD3NA/fsJ/WlCwpj6pzdrr9I0//YPxY4OgU0ZN+PwbIqDIjo0UNqSHG/S+PfG gU2tHaYidgCpa9V0ysAh6O4UWYOyuCzdu5IwY+Gpt0YyjVl/lWeB8F2Am16+zG1IM3Gr 285QZHqyGCOQD1tSM15lM692t+6M3TtiLLdTuXjfSIYLWu0b9Yu60DwJQP4ykQH0G0JX 9AOw== 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=MFXN2Ty2XhYRGK3+3Z24c93g5Am07T+SwQ62+5bML6k=; b=NKGnuBKgQjsKHtLUyqIAvMv8hIZgcLYFXvi+3oNlHpEd9Mp/7IiZ9w4iT+hj8R5wM6 wyuIhntTexAnzAvrPbFyqwWI0XnZdPvbYAfbKuiER4pTqY+D+YTM0hMbLbu8gaSy+09+ W4xZ4s9bPYIllWnLE0lBM870AmfftCSyTKaKpEiXoAJK47u6OSpH84EZH7zdGu8brI+p fUcb8BssJjDiul2Y9UIotrHkjY8wuVi4ALeaYiD1r/LuENAx0rpZ3zRc+Oq763Wquzrc ihUwd9W3nbAJRgLu+JrOsi9tDY8D9KvJTtE3AnM8Jo3gO9d9J5zRkukeBdIkwCQhYdDr ju+A== X-Gm-Message-State: AMke39k+1i7YwOSfbBHPcEnNNbg4DVwawPCk3ggmMVNJS80Mip9u9a6lQplFRmC7pwCMDA== X-Received: by 10.28.16.211 with SMTP id 202mr33068717wmq.133.1486810581786; Sat, 11 Feb 2017 02:56:21 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 91sm2851315wrd.65.2017.02.11.02.56.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Feb 2017 02:56:20 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Feb 2017 11:56:07 +0100 Message-Id: <20170211105607.6115-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" 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..0e30cb0 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) @@ -94,6 +99,9 @@ static int mpl2_read_header(AVFormatContext *s) if (!len) break; + if (AV_RB24(p) == 0xefbbbf) + p += 3; + line[strcspn(line, "\r\n")] = 0; if (!read_ts(&p, &pts_start, &duration)) {