From patchwork Tue Sep 24 22:03:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15275 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7E4B6449BE7 for ; Wed, 25 Sep 2019 01:03:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6632768A3D7; Wed, 25 Sep 2019 01:03:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B53A68A329 for ; Wed, 25 Sep 2019 01:03:47 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id p7so2065911wmp.4 for ; Tue, 24 Sep 2019 15:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u4e7QAhVNGuCN4sVQniqJaBiuhgv7aOxFMB4PkrNXas=; b=LouOkdNmBNfCFIZtTrcHsGf9d6JL8SaVTQ+UOdyehJ+4ARRaGG4v64oiuSfFDWDD7t w+hXl3K3dAQnGdI52lVWvwDDlqM+q9Y5bhSSDwUCLYU532AdIq5BEI2QQ4uityc0mnM/ 79jyo18XTFvLF8fiLxfuRKUqHZIkLWhNTA+TOlkGXnL+CourjQPQa1wmiz0oJZLzSzCg eULSUf9+cgXIqPwOoDyui65XCITRpciQ5p+0h1fafWqmbqkCOF2kDvaTNxJaoOkW1jBn 2pD07Lk+JhblEvUgaMCDQK/TWYSeZ0FX7CMEeF+TaHk3TGguPB9jbulM4qTxoUKkvxo3 juCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u4e7QAhVNGuCN4sVQniqJaBiuhgv7aOxFMB4PkrNXas=; b=n63CiKo7ehJief4zmf5m+oCw7kTN8souLo9TFGu//mnBHwNML63p6ncKY4K1k7vTkr aFum/ZyjXx975si3ekW1BVulrp+/PSzzvv0WHv3Kw3iN97dhBstNb/LqnlJHvVIr+WmQ OS3mpKzQ0Nmo6JWFkARO0sFxezXjGplKsTCeHfS9Y/L2pqXvWx0Gr1U+JBU3bxij7+Wl uvDzzyAbXarkJPrxWMIEpEXdqL4fRq2o0jckh50bQTx4Nshq19kKNBU07d2mvFxBG4uu entoH8GNb6VNjmlmUBNylfZO2LxNcWe1vw3qGUfcGNA5DrnuqFg89T868PJ9pR8Zrq5l R9Rw== X-Gm-Message-State: APjAAAWiLt3SyEqKB4wfDfmApeSkiBQEi87kNyxgJAULvrwU5xoOXtIg vm6CTjunUSYnKdJWTP+H76fy3rOI X-Google-Smtp-Source: APXvYqzRO4mrQMlZN/x6A8fGXnzq87ScAxfXxaeMyIaac2oTTOoLOPJYg2G3mGHBTQvXLqu9Dkk+Eg== X-Received: by 2002:a1c:cbcc:: with SMTP id b195mr3052718wmg.80.1569362626762; Tue, 24 Sep 2019 15:03:46 -0700 (PDT) Received: from sblaptop.fritz.box ([188.192.248.87]) by smtp.gmail.com with ESMTPSA id l1sm3023808wrb.1.2019.09.24.15.03.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 15:03:46 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2019 00:03:08 +0200 Message-Id: <20190924220310.31157-14-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> References: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/15] avcodec/vc1_pred: Fix undefined left shifts of negative numbers 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Affects the FATE-tests vc1_sa10143, vc1_ilaced_twomv. Signed-off-by: Andreas Rheinhardt --- 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 e1ad0e1d7d..f714d7ce22 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -191,9 +191,9 @@ static av_always_inline int scaleforopp(VC1Context *v, int n /* MV */, n >>= hpel; if (v->s.pict_type == AV_PICTURE_TYPE_B && !v->second_field && dir == 1) { if (dim) - n = scaleforopp_y(v, n, dir) << hpel; + n = FFLSHIFT(scaleforopp_y(v, n, dir), hpel); else - n = scaleforopp_x(v, n) << hpel; + n = FFLSHIFT(scaleforopp_x(v, n), hpel); return n; } if (v->s.pict_type != AV_PICTURE_TYPE_B)