From patchwork Sun Nov 10 01:47:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16188 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 52E5E448063 for ; Sun, 10 Nov 2019 03:47:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C0F568AD93; Sun, 10 Nov 2019 03:47:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E521568AC1A for ; Sun, 10 Nov 2019 03:47:41 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id l17so9046462wmh.0 for ; Sat, 09 Nov 2019 17:47:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=M/Jj0WkOZRccINu11jlpxspQhpnbVfEC72dRMCzc8GY=; b=bGJHleFkTzWUgWoERSZMrGM4ICEjB4SufZCnpFrNsMgBViOU6QlbYiPYCUPGneIJsE 2sjDHVbVUh48OeTn7+MoVRhpSevHRzmaKP9tBq/3togm5u8xeBfitLTwL6As/9/D9WQP TrO8BsLHh3UioPNM9f2C+GtVY9NdY+N1lu3hsfeoTk2lyw7HbREvcP6AxJU3CWVvIEJo 90ztwL9GJzSf0FrMS7tQDQJWFpH+W21HUZUM1XlInfplfRJKlEobARXPRDnrTu8sg3YI 9HCfMwC9bbxMZ7VNidG6prE4K2PiMrE1cpjdygo8FymspGUSJi+uKJXI/napzH9ph9jW AxJg== 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:mime-version :content-transfer-encoding; bh=M/Jj0WkOZRccINu11jlpxspQhpnbVfEC72dRMCzc8GY=; b=Npzeg9eP53v1axUTOd28jrew3lL2hiaiaTsqsW7m9wwwREXAOX7y714HtApU3Yxt1b cZ7bGB+b6sIujTojIy2POUvFIH12aBLwjYeLXxLVYmi6fO1r3vk6KgCCsysmkFABoEMw xC+o6e150SceefAChxgVdwjmQezZEpBvbvZMeiJU7GoLAGgvPyWW7wc81n55m/ydxmSv jHD1EMv1SssZwc9OYaV2fZw9KdkZcxxlXH9dFYfkn1p/q9oPqvZThTrCAuI0OA0zk5Xt kTpWWNH0o4c8O3NHwQI2/yQvWjMhCJ1cu8gjYs8C/ttQMm0Cw2jn6dDtiJTgari1ut7p kO2A== X-Gm-Message-State: APjAAAWPoENpZIJLWRHm88u5uXW7Mq6rR7oeMK2Vx0WMLIDsXeNHl5Go bAyUWTAhVImmPG0NEEeiWN8V0DoZ X-Google-Smtp-Source: APXvYqw8NSt6SPJKbX++2vdx0joblmeYCWPuWC81K1yoyNOBN9d9bK1/d7sYLV8icb0zDfRCyXu85w== X-Received: by 2002:a1c:a107:: with SMTP id k7mr14274063wme.146.1573350461145; Sat, 09 Nov 2019 17:47:41 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id r15sm19122129wrc.5.2019.11.09.17.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 17:47:40 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Nov 2019 02:47:24 +0100 Message-Id: <20191110014724.32538-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/dvdec: Don't use restrict directly to fix build on MSVC 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" 004ebd4b added a function with a parameter that was declared as restrict and not av_restrict. This is not supported by MSVC as several FATE-boxes that now fail to build show. So use av_restrict. Signed-off-by: Andreas Rheinhardt --- Here is one of many logs of a failing build with MSVC: http://fate.ffmpeg.org/log.cgi?slot=x86_64-msvc15-windows-native&log=compile&time=20191110013536 I don't have an MSVC setup and can therefore only attest that this patch doesn't affect either GCC or Clang (as expected). libavcodec/dvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index cfa0fb9905..578d7f505f 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -269,7 +269,7 @@ static inline void bit_copy(PutBitContext *pb, GetBitContext *gb) put_bits(pb, bits_left, get_bits(gb, bits_left)); } -static av_always_inline void put_block_8x4(int16_t *block, uint8_t *restrict p, int stride) +static av_always_inline void put_block_8x4(int16_t *block, uint8_t *av_restrict p, int stride) { int i, j; const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;