From patchwork Fri May 18 15:06:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9012 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp5415563jad; Fri, 18 May 2018 08:07:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqd1rMf+T1zFMyZJx0dClW5XuMic+kfZgYes79x6DrofWw1yZjqC0mKHZiu49eeJDTji8LX X-Received: by 2002:a1c:5e85:: with SMTP id s127-v6mr5200836wmb.123.1526656023553; Fri, 18 May 2018 08:07:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526656023; cv=none; d=google.com; s=arc-20160816; b=jUlIspAKY6dAaN21zWckwmsBX7A1XM6FSuD8qAEjC+FZ7T3WEWG1AVBK6q225XlYI6 2bQidRrhzptN4RUsjas4Yub2wJD/PNnkdjiGrTL8Kl8CjufN7vxdWqik6dv1ft2jRZMM 4blFDALBLMDrOHyVoQE6TaxXJRQceDiLDB4mA1LMR/ZbFyBpENqoM30k2QGNF3htVuIq /W6PWpWRUre3c3l11OY+OLQIOOEDWT17MBmmAbClwpbUQjNxqHSCBgSXSsfnKKm0xhW3 HHbsgtHss3GeXtlV9WWgU11rqkBLeGe3RZHUgme+TPJ3ByZti2GEZFVArbqz1mYyu+gE EuSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=PxzkpwTf3o8bzToJ8rnbjplXFmPzO7G0Qe4yf1COTIg=; b=HwpHmVQ09/iy3Yl+j8KqyRgAfFkQpDjHGA6Q7ZchthXXXGhJfKUjGhz8DK4S9BHUFf 95FmupD11iknsWUK+qjahv0RFMYbJQrjg7ePU6svBlw6FN+ObUJye2lO2IFlMBhA1TOE cm3z1OcYEBTUmSwf3+WA6X+Rzb/r8tZzMWJfa550CwpaZil2F3w2dQ852x6a0+fv1nS4 5BBWnKRxoYHDkmvS6/Atx6qKeGOWmNd33SL/KtQA+6bT/4QJr2t6B3I12r06Tc5T77Na Rf7oEZqvTBDum/iHLqSVoDXAwp2O4ZYlYLYdTdn4z9j/g179qdJmCeRmfsuMZsryE7wA 0kTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=SNJzr8UP; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r74-v6si5823324wmb.153.2018.05.18.08.07.03; Fri, 18 May 2018 08:07:03 -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=@carpalis.nl header.s=default header.b=SNJzr8UP; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9470768A3B4; Fri, 18 May 2018 18:06:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from kyoto.xs4all.nl (kyoto.xs4all.nl [83.161.153.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3324568A38C for ; Fri, 18 May 2018 18:05:54 +0300 (EEST) Received: from [192.168.2.133] ([192.168.2.133]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w4IF6WeX009642 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 18 May 2018 17:06:33 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1526655993; bh=9I0pPawa3Ixq1prqco7NOfF6patB926FdGng1EQ+BN4=; h=To:From:Subject:Date; b=SNJzr8UPDsD7l9lCOZzl/jDZGixv2SJGDFPhy47uLFaRxeoeEwG2pDqsuU7SDYYxy 6i4I3ECP9WvUGhsRcopZhSSB47Oi9L6wejdAbQbLkFwKvkaNS5mUEpZcCzAsCsJGpx l28b8lrSviUYPCpUfm/FJUnE18yZJnXjUVs8TTZfkBD61nzrGRjR3hIPn14B/e7MyX rbfldLJfXEXYeUdIi4JMlrdFE0naNBgYwud5Vo32PUshpetRSMChDfarKG9Zv5WZbE tWSIFa5XN/hMtB0cvDNBkS1iEP3qlpJXf6WLqepo6ba/gypmQ2HvM2HOEQzThpyYOg 7tOA/rU+DRkBQ== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: <5270aeb3-9ab6-50d5-ded4-5b8e8c67430e@carpalis.nl> Date: Fri, 18 May 2018 17:06:32 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: nl Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/vc1: fix calculation of the last line of a slice 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" Only for the last slice of the first field is the last line of the slice equal to the height of the field. Signed-off-by: Jerome Borsboom --- libavcodec/vc1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 750f4dff1c..fdbc852ec2 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1082,7 +1082,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, av_log(v->s.avctx, AV_LOG_ERROR, "first field slice count too large\n"); continue; } - s->end_mb_y = (i <= n_slices1 + 1) ? mb_height : FFMIN(mb_height, slices[i].mby_start % mb_height); + s->end_mb_y = (i == n_slices1 + 1) ? mb_height : FFMIN(mb_height, slices[i].mby_start % mb_height); } if (s->end_mb_y <= s->start_mb_y) { av_log(v->s.avctx, AV_LOG_ERROR, "end mb y %d %d invalid\n", s->end_mb_y, s->start_mb_y);