From patchwork Mon Apr 23 19:00:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 8617 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1021414jad; Mon, 23 Apr 2018 12:00:52 -0700 (PDT) X-Google-Smtp-Source: AIpwx49l1KLnfXf/HkkaioNMR3UHcwkaqJlh/qTM4cJF7wM05ODu7YL8JECJjjzAB3JNYWe5McPA X-Received: by 10.28.155.206 with SMTP id d197mr10730253wme.44.1524510052849; Mon, 23 Apr 2018 12:00:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524510052; cv=none; d=google.com; s=arc-20160816; b=D7dX9CaHwBP4ndbDP45Dj2HtBeadCFkDCejD2i0gBi8HFVNBE+YQ5NE+psmLUYQpFt ftlMlD70auyAAVLgfBxrC2AXGZmzlsPA7T+iDhnF6X4S4dFA5GoJtEpCducPnx1mkGG9 gchx5omvn2282BtSBWmjbuQbiELwiAD/3fqamDuPxK6i4aUdcoJz3SPtIU70CwemzGqa q9V9wbHBAE/CKGrc5oGwtqyN4ezXaZzHfby/EUvQDbOWfGo7FnC9yrk+AKGsgcmXs8J5 TAHlk/1Ap4rjPtY01Z9rXvPPkA9mZKFG/uKG8aRJcs8CGQjKRQAjg3EULnHNtpu4BjVv WizQ== 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=OtQKGvBa9hERc5XjWSd9FjYgONwDXJmsaY7fC53mk+Q=; b=OQRvYxmesAQQtOlJe/AK/g118CwUhu1KLuHNr7skEB7otZF3GE0YQECAS4rjhAogii s6GxXb5XCprSJP6xF07IS4wnh9iD4iylsoX/l2BItrwO9NycYbuooApVGQpOHEKMNtMM NSrG+5030RQ7+deZuDIbV89I+jDSWkgYQW7AYTBH+OM8gLmkqjhG5sQvFI1VFY133qv8 rsmGaXKcd9jFJAVDRzD8KAVxrM7Xdvgz+OPzsSQHq56u20Bh2WBS+gUDG8xdsYv8wHDA d6Uu5A4s1i7Ct9jdJNhwOQSiiP1hmIkspLCYnwL5StMyjgHCoNZDada+cZpGbec1ZpKm bDGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=dG+xwsze; 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 p192si5848925wmb.122.2018.04.23.12.00.52; Mon, 23 Apr 2018 12:00:52 -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=dG+xwsze; 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 8A24268A204; Mon, 23 Apr 2018 22:00:06 +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 9F22A68A1F4 for ; Mon, 23 Apr 2018 22:00:05 +0300 (EEST) Received: from [IPv6:2001:980:9507:0:8e70:5aff:fec6:83fc] ([IPv6:2001:980:9507:0:8e70:5aff:fec6:83fc]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w3NJ0XUG003345 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 Apr 2018 21:00:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1524510034; bh=qThIeH875UPW8RXeIwsEkwwtcNwcRgI0NYOsT1piHrg=; h=To:From:Subject:Date; b=dG+xwszea2e7WBVDB52Ki5B4KDUatVigWx7pMoAikvN6rJbiWQN7Ey0uxOjeX6sjX zURuGgDQnJMMRZMronNjfLnFK2nIXvWjsGlgZg0w8oV/ltjXI1yLy0sMRQZADS3tO2 mDiMag/ruUSVyoH3HZphWYChMzuPRk1SB4CgAkNLXkIu/kmPgmiYijtqgEZ505iwJy d4Jz/cI7cfj4jZ+uaqm+E8x61wKlWfD+zwaf4/3bd/hHu+EMo56ShDZuGIki2IX59w +sCOcX4Eb+ikYUz24YejHFLd6vPqNXdxc3bbF1+FryHELtLa9jJ7VLeWChqDbpN9Di 9El6MWY7AecMQ== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: Date: Mon, 23 Apr 2018 21:00:33 +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 14/14] avcodec/vc1: correct forgotten v->blocks_off 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" correct forgotten v->blocks_off Signed-off-by: Jerome Borsboom --- libavcodec/vc1_pred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index 3a52a22bc6..de736ec775 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -254,7 +254,7 @@ void ff_vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, v->luma_mv[s->mb_x][0] = v->luma_mv[s->mb_x][1] = 0; s->current_picture.motion_val[1][xy + 1 + v->blocks_off][0] = 0; s->current_picture.motion_val[1][xy + 1 + v->blocks_off][1] = 0; - s->current_picture.motion_val[1][xy + wrap][0] = 0; + s->current_picture.motion_val[1][xy + wrap + v->blocks_off][0] = 0; s->current_picture.motion_val[1][xy + wrap + v->blocks_off][1] = 0; s->current_picture.motion_val[1][xy + wrap + 1 + v->blocks_off][0] = 0; s->current_picture.motion_val[1][xy + wrap + 1 + v->blocks_off][1] = 0;