From patchwork Sat Jan 20 15:11:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 7368 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp841972jak; Sat, 20 Jan 2018 07:11:30 -0800 (PST) X-Google-Smtp-Source: AH8x226RdqJn5H5ZAvF1xHqkX7UNJHWDsK4sTkotmq58kbIKdZZsuGsEWqkHQ56Xld3/b/Ko0Dtl X-Received: by 10.223.139.67 with SMTP id v3mr1665417wra.162.1516461090093; Sat, 20 Jan 2018 07:11:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516461090; cv=none; d=google.com; s=arc-20160816; b=HAfOZ1Jw5EFUeQB6c50DQyR46mX30xi1E90tKSMx5vndBzVaJnvRCOid2FNcah5Sls X693dupqdyOJk6e1a4WDUFXeD1dVgZHMrjv33hb3plLI/T2AM9KWFL6hxA8Op7KX4EGw ySvD8MRy6XlvR74JroDmZi1lO7ppIcotHuYmKR30Sfz0Cw1N22Th6Hat81NifpS7iBpO q/7Re2KdR27vw8jEk/QZB2PRM8tJCCrTZMhmu0vuFgkEc8n4uiubx5gkc9tDGG1sumPD GrRKMMTmkLJvRyPjwucBQXyeJoXWR0UQ34hIcfCz7fJGRCYocFxsIuptoGOP8a/i3Z15 w/RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=QVTTigfL5HSJP9zdRCu+0kAKADs99oBTqiA8hDqz1JE=; b=tN6i66mRvm35PWbGoLGUJd+QoBbKngMsK9Z7ZEu8uLJopvvEKAyB+4LGVSVI8rGyVK x44AWls1smLvWkiFsarrHY+xu1VewEVCTGXz3OdhSFZWkyUO2erXh/q/LfTlUHh6rT/I jdFRlwiMo/0cw8w5007ATsikFPiLWcp3WWSbwOOhOWLm/fmURiuxIf02h1YhA2amjxOl 4aI/zM1im3Gm64iSOCszK4g6H26sKcU5mg5lGyfWsCjnIRe0uAIgrnu/v9l0uywydKx/ ySOSF07UYkdp8KmuMQKmD6tOO61a9I0w8+a1zK5gLbZNs9UJkMcDqsqUFxSmLWQD2lNt DSCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WiOZbFqn; 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 m64si2545048wmb.228.2018.01.20.07.11.29; Sat, 20 Jan 2018 07:11:30 -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 header.s=20161025 header.b=WiOZbFqn; 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 9FCAA68A03E; Sat, 20 Jan 2018 17:11:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f180.google.com (mail-io0-f180.google.com [209.85.223.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F24896882AF for ; Sat, 20 Jan 2018 17:11:20 +0200 (EET) Received: by mail-io0-f180.google.com with SMTP id z6so5113653iob.11 for ; Sat, 20 Jan 2018 07:11:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=c6Gt/+Cbukcyze7viMCeiIl9L1AwUB4T7r1+WxmnsOY=; b=WiOZbFqnfmy6HyZ0vYXwvlRuknRD/Tlhm0e4QvRi0jNn6262Y6UbThhpiomWw6lVPy 9vDez77NWAIqZvnEVRA4efxfWTtLruZpkhMS8kZmufIP1FUl1b/OIgMDAfDxLYDLpZAF yo4QQYvMJ/iOmH2UmuMNdFhr5molvf/eFh/vwosMtB6lcgkemTmLc6qqXGlx0JasXtAx 0lntg/JvXuL0srttnD6fP1o7GZTuk/RNw31vzZ0SfotolqiVbo7t6lm6ucY9bJGiiI1i haq+PShv8HYlFRrMw2mN2gdtaBshyHM3UYnjMFxPnpg71ylIYt1UrhTwtXtc25YQjg8H igMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=c6Gt/+Cbukcyze7viMCeiIl9L1AwUB4T7r1+WxmnsOY=; b=eJPm4N9UB4sd38sZaRmAJGm3kJgjvshNHxVBr2YaIdhNhB6pbcQwyx3Env8aY9X1vs qPL3SIUuthCQrqhQudSBIvj75VGpQkKGwzf5TzpSrflowGWbOgjiZ71wes1EGLXWOpr5 cn7aRlI//H6M8bULDWFPJ/6zPFoBL6779dKk3WQXiXEaZtQKgTolB17Dna3K9Renvehb zZ8V6zyGDXlA6Dlr35FQlFanv1YIQs7mwBV4il1vBDRQ+I2SrS+IM9tsiZQrKdqixIaq wm5jxY4mQVXCJ14toFfnRRYk+wK9xv1ATEbLxKstZnF/dIgJ9hoCyTBKZh3uLXhf1zqL 78zA== X-Gm-Message-State: AKwxytdGawJTPnQP/qAqd0zy1DV/vJFIWpNswCTIhXObKI8tjDIBHWAc UvSZHlvE5iuO/640qL+ZjoPbq/xPLFMoD7sLwJY= X-Received: by 10.107.169.94 with SMTP id s91mr2108172ioe.83.1516461080816; Sat, 20 Jan 2018 07:11:20 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.138.170 with HTTP; Sat, 20 Jan 2018 07:11:00 -0800 (PST) From: Carl Eugen Hoyos Date: Sat, 20 Jan 2018 16:11:00 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/rawdec: Probe last byte for mjpeg 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes ticket #6957 for me, I believe there was an off-by-one issue in the original function. Please comment, Carl Eugen From 0711e0474f9a83ec47a31b8cf261cf2e6a10a35e Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 20 Jan 2018 16:07:25 +0100 Subject: [PATCH] lavf/rawdec: Also probe the last byte of mjpeg streams. Fixes ticket #6957. --- libavformat/rawdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index e926549..b38a4b5 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -130,7 +130,7 @@ static int mjpeg_probe(AVProbeData *p) int nb_invalid = 0; int nb_frames = 0; - for (i=0; ibuf_size-2; i++) { + for (i = 0; i < p->buf_size - 1; i++) { int c; if (p->buf[i] != 0xFF) continue; -- 1.7.10.4