From patchwork Sat Apr 21 08:22:52 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: 8545 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1528384jad; Sat, 21 Apr 2018 01:31:10 -0700 (PDT) X-Google-Smtp-Source: AIpwx48v9tGtfaU72zAtK2sJ7NMx9sx97tkb0WGs5ueSmFuT6JgFEydTBnm8jc/hnCPbIt5atsw0 X-Received: by 2002:adf:91c6:: with SMTP id 64-v6mr10681061wri.136.1524299470732; Sat, 21 Apr 2018 01:31:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524299470; cv=none; d=google.com; s=arc-20160816; b=awNTsDoYQ1bRV1eRvrhdsCCYWXYXR31LR8dD/23uL8E9Q2pZfB81HFm/wq/Q34OD8L loVceqK4O4+MpVLtSrvXTGWiV8ykxN85QPMxRJP7KdPKdmp7FTuz2AlTxsI6FYhppQZL GG2AOtn8MNgQrNike9vSJhu1MoIk1qmyL3E4KjDoRWTOkUc/W/My2ZwfPbvVBgFlff2w 4L/rV+MN2irf5YtpS43qnf7pPsPQD5xWs14IYbbBsxSB6WLzkHNBElr3QUJ+bc5jrqfK WKW/Dui3pj9ODE/SkD+WAfa9/9EnMU1ivo6HlMQSGV621KWqRflgAem2nvpWzcxBpmpf p6UA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Psy6mU6zOYSmaHAKY97TVdhnAAXgXaHsVWDOGE3ZBnI=; b=DRc7Y2e5NaRfQa/Xzb4Y5ALj+oaqM+IYNxVH+TQuG0jcxrl8A7+pjviyR6SJtA+3gA F8/+JmpCCDuOcN0QDbDy808KGDXMgetzM56mIzXxqA1gSqZrkpLWYU+8mM6GWmiPTd3F 9YLTW0FpeuIopjMC89j2/pvb5KrLu9+74BSTNQXNYIfWhswONhzlEDeNPSGmclT9ZmDG nwN3dRFuZO6zxvQxE3nLdchKYfX2Uw5D6p5RCsDDpIYuVcKHfsBjXOjA3woOAo+5Hj8w y8rdABEQbt/JGaKimlmNbCwYkrXOTI2JLNRpAhPc0G5PP9mhPCP1540ci/ksC5n629/h D1fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=n1SrYRzm; 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 o11-v6si6350118wrh.271.2018.04.21.01.31.09; Sat, 21 Apr 2018 01:31:10 -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=n1SrYRzm; 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 E27D7689FF5; Sat, 21 Apr 2018 11:30:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 915CC689C28 for ; Sat, 21 Apr 2018 11:30:33 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id d1-v6so28427489wrj.13 for ; Sat, 21 Apr 2018 01:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=T0RVjigumRP74/P0vMMTdsOlj45KzYwkvqpuw34xWU4=; b=n1SrYRzm7wwNBpnyrppS8APe7Zrho6dz6ErKNtC8e2FV7txqqVBO/oRPbv1LaAE0Uh y+8Mqfq152FUsVOrG3Z02F+4Bg5U8ZLKEPQLbKCkoFwKvOzzSk817eX9jVs0+N45E5Ou Sdpe1lQr+18NBVwzE8LTF+6+Bt1zd7efB2LfZB7cxbvlbBC/sbPz4yzd9D+QA3shFSgl jLyYGeVtlaTQ71WwclYvkZaOQI/ZPKBwHMMNUVmLg/ePpbFtVj1/vEcmGCKcfci1oAL2 CKTJGimPaLFcXS3PhVXl6L3K6g/K+iD6Ub/aAcmP3PSdKkg3G+HdoZWY3Xergjpk0WZx iBUg== 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=T0RVjigumRP74/P0vMMTdsOlj45KzYwkvqpuw34xWU4=; b=c4IqZU6pnZD1hZPEtaoCF+oucie9rfEklrAVPBTQMfNPpVTcUp8xyd3y9EF1OQFBJZ 3vTxYApibcRUvAuAvE6+lGjpC7RW5PwjREG2sDLWslKt5ppAw26tozF68MGN1+8vysni I/Iw83h1W7xEUg/99Mea8uSF+J0++r7XUNjgYUA7vhSljjyxofEasnWEkfGRK1So53Xj uDHIWyKs/7POjEFdeaesv8ufe2DsHi8baUbFAAKRJu+ZVfz9alTuUZTC6v+f8Rcb0YFZ CtrO2yNTO+1EEE45Z/b8aHG4Yn/xfZM8S2Mf1SRjoydTAMnpGuyiqysS4yNrFjW+g8ja Eezw== X-Gm-Message-State: ALQs6tDG3oujq20NIGanWI1Apj7swcDW+fujSFiRSRKT59xiuJNEWEXk SiCKT270F0RnKuiCwvip+HAIBQ== X-Received: by 2002:adf:af28:: with SMTP id z37-v6mr10533398wrc.72.1524299039096; Sat, 21 Apr 2018 01:23:59 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id n47-v6sm2107214wrf.6.2018.04.21.01.23.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Apr 2018 01:23:58 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Apr 2018 10:22:52 +0200 Message-Id: <20180421082252.4186-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avcodec/vc1_pred: properly clip interlaced motion vectors 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" Fixes #2557. Signed-off-by: Paul B Mahol --- libavcodec/vc1_pred.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index 54712f6b7a..9f42a930fe 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -98,9 +98,9 @@ static av_always_inline int scaleforsame_y(VC1Context *v, int i, int n /* MV */, } if (v->cur_field_type && !v->ref_field_type[dir]) - return av_clip(scaledvalue, -v->range_y / 2 + 1, v->range_y / 2); + return av_clip(scaledvalue, -v->range_y / 2 - 1, v->range_y / 2); else - return av_clip(scaledvalue, -v->range_y / 2, v->range_y / 2 - 1); + return av_clip(scaledvalue, -v->range_y / 2, v->range_y / 2 + 1); } static av_always_inline int scaleforopp_x(VC1Context *v, int n /* MV */)