From patchwork Wed Apr 4 14:09:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8328 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4933324jad; Wed, 4 Apr 2018 07:16:41 -0700 (PDT) X-Google-Smtp-Source: AIpwx49Ba3VQGfzT4upP4q7P2Aqw0HEaN9yVwmBkmw6RZz0a/DFcs6Yzigz2D4nLn6Dxrk8cjPjT X-Received: by 10.28.143.132 with SMTP id r126mr7041207wmd.45.1522851401766; Wed, 04 Apr 2018 07:16:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522851401; cv=none; d=google.com; s=arc-20160816; b=bNeaxZBqGCyI3OpPNjl8IVTQ4qpVX9OJ6wEldXZJirFP2xb7lw6tCnqg7FC4ivsCtK CPi3d09Fi5EgH/GqHqS+Y0STzp2Rycu9Pn9lmeiL63GlR/Zi/sPosprZnnolobSV39Q1 QkRIxBsd48XFyk/V9eeRPI2UjjKdBKHJp5KgX/ZXPrOOYrFkHMkCVKOEMvVwHZym4Rqp usEeyhGTBV5j1MFIijXvKZbvO66CKiIXyxwa+FS6S7k1BHnvzUkbRo5GYbvpjqsFNf8I ZTp0iUQ7FD5NGWcTYxdw4TX4THWMf6bRWV62skf9UgqsZ3XZJmShQ4hUBGi3RGrfLs3a FrWg== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=IDcWSoYppB3u8xX2C/+oV0ubpQgtOGkqJB5LJs5+EpE=; b=xpHC+1QbDE5y39dn6lsaKK51oskUH74E7aRx+/RFJ8UnAKzroodjG4asSmE8j2LQOM St7HQadjtnTntxUtkaZ2ir6wyvAuDWOWElNhAikk5oiMZAJcwce9B6ygzWq1axGiK7A6 mzmqgNgfmYzvdA6gPzgKNQkuKNiUS6blutwHP8lAmgPF2ErOSl42rDgKnN4KjOCNpJN6 JiruxRB18valfFxLiYw4gRSYK0+de1E7Ol4jNBwX8MWTRIEdZjTrJQ5cRfPVLe2NYIkQ vaaVjpjW3UKhxEMoeysR87i6/jF4nOb//798QIRY1rzdF0xe5HlCs5tLMZPAtVW/D3Xf 5zcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=dqdsWLOY; 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=QUARANTINE 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 188si4011004wmx.124.2018.04.04.07.16.41; Wed, 04 Apr 2018 07:16:41 -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.s=20161025 header.b=dqdsWLOY; 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=QUARANTINE 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 64275689A03; Wed, 4 Apr 2018 17:16:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D559689951 for ; Wed, 4 Apr 2018 17:16:13 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id s12so12355706wrc.8 for ; Wed, 04 Apr 2018 07:16:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=9EyZGKjUWIS+KpX6gAN5sEko7t4BD+pA7OSqDO4cA38=; b=dqdsWLOY5YXxu8wVCMJnqZgBVWGkXLN+23cUbKvtK421cMwWKLAO0gKKSkL/a7Zk1s fnC0kBIXxI+IIUt40NKoEVcWB/sgH1yVLonIakI3edsOr8BCAnWNPhuiikqUcpYGP2J3 ArSFuxuqKN7Ysb76dYmvyF6Evde7LGeb8GkCATAoi42s4nY4ZIMOV7ztexDIHW04ILIq 7Rg28VP7e/lCuOV6dt1JJly+RZSCRAgVig1VLHKF5R6zrbbP4BCEYKIaJc/FxhsmIO6f nyQaFAtcQJq7uvI4iPyCKGmO7BRy/JocWF92fpiD51LwR3aHHMyHc534mZSlviaSL5Q3 Cghg== 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:in-reply-to :references; bh=9EyZGKjUWIS+KpX6gAN5sEko7t4BD+pA7OSqDO4cA38=; b=LrjLP/bAp6fm3a7Vneo9EBRiMQHkqUrpv7rjmYMzU1QEUspebkjk0B17JzjU+vY9k4 SV9kF7NfKfIHogbrW80FUj2thhQrIv56nK/YL11s907JDyCwrcW/IYIQlaqkddHgubD1 TLUTtPBJKAxpGCOwFx2h2sqW5JXD/RxOKgXGjikxWnYVtezAdFB3JS/AxY4pBibJAXCm EyVtYauJ2vQScQPvxvETpdykYUMpPRVEBLmhELxuUfGRnjGFsruUkXOxXxfND6MvRA2Q kHT1WzqGexv8rCmkhNeufWYgW1LCCku/YG5v1k+hH10gE8Z3YzwOObek2tHP1psknc9z /12A== X-Gm-Message-State: AElRT7H8CafzONJ6tKnqoYkgesn6n7PhVdVLG8JItHednfvmbpBLUSr9 arZynXVjU7THcLTPpiLSrS+cJg== X-Received: by 10.223.150.161 with SMTP id u30mr12822377wrb.151.1522851038083; Wed, 04 Apr 2018 07:10:38 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id u44sm8662174wrb.67.2018.04.04.07.10.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 07:10:37 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Apr 2018 16:09:36 +0200 Message-Id: <20180404140937.10331-2-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180404140937.10331-1-onemda@gmail.com> References: <20180404140937.10331-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/vivo: improve probing of some files 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/vivo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/vivo.c b/libavformat/vivo.c index c9e9c37f37..6a88a09a01 100644 --- a/libavformat/vivo.c +++ b/libavformat/vivo.c @@ -59,9 +59,10 @@ static int vivo_probe(AVProbeData *p) if (c & 0x80 || length > 1024 || length < 21) return 0; - if (memcmp(buf, "\r\nVersion:Vivo/", 15)) + buf += 2; + if (memcmp(buf, "Version:Vivo/", 13)) return 0; - buf += 15; + buf += 13; if (*buf < '0' || *buf > '2') return 0;