From patchwork Wed May 25 09:53:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 35921 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp973958pzj; Wed, 25 May 2022 02:53:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxg8EOQeWIRSUzml6KPOAbTceisBBn51F26BrFnHhCoDpyKY2GNMQCOCL9C5Mi8hdRhXrmy X-Received: by 2002:a17:907:720f:b0:6f8:5c31:4027 with SMTP id dr15-20020a170907720f00b006f85c314027mr28167299ejc.284.1653472430909; Wed, 25 May 2022 02:53:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653472430; cv=none; d=google.com; s=arc-20160816; b=qLBmm76CmDz+FxL2bWvPKKZ/LGE3xGPuSAKHDw26da4rdNakLgETXgpnrh/xE3BD9G D/kb2LQ+282LM21ANiT/+ZLs2hRKH+mIcory23CAWGxmqROxisXXmRgrwNzrIX2ZwQIc QtMLmJRJ7rCYlhqfK4mmP6vtIP7SkV03COyXbiXoGv2dkFWS/f1m1cx4ObZl58ZfZBff O7nDx8KtdaL7Z2qW0wfVxOQ6Yt94l/JneQteVzv/VBp6VEfxGofILr4T69KGK9IV8NTJ sApn+NXJwqXvIXc6o8VbHUBP2MtZ9l7/CZU9VzH86rDtIipApyLkgwm28f2bmIWgwbSw F0mA== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=yhTDc4Hvgc58emZhSyTyk6uXvVsxZ1IbUahg6Q+mFkE=; b=UMvN0xiW2PZn/hNS0SNDeoGmSINNMIRMQEPe9lu3leu6zcBSkwxL32J6x2BQZcJQpx vCnS8TUiisrjgGlofqRSqr6ePl8mWAadGyRLuIBFZ1+TDL7v0iYMQ58GScmu+Bo7ya5L 209guwwbHrvLRhKnInB+iLJo+O1+1eH2cnvsmsba6rTYzX00t4l3CS+rSLn9XfS/vRxm vIpjZ8bMO00yj0xJpcpLHz1jDjrZTTMA4GtTqNwqw8Dz+qBrczOGLRvD6l7zRUWkwsOA KGn6JxNMqMhWfmRyBfdcqFVRoe+/MBHite1Zwywo9S5mvRFpxbDFBpg62xxfUhGKq3ZQ MPSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=CKDvBHE+; 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 kl25-20020a170907995900b006f4f63de4f8si17409472ejc.871.2022.05.25.02.53.50; Wed, 25 May 2022 02:53:50 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=CKDvBHE+; 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 137BB68B4FE; Wed, 25 May 2022 12:53:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE7CD68B284 for ; Wed, 25 May 2022 12:53:40 +0300 (EEST) Received: by mail-lj1-f174.google.com with SMTP id m11so12425964ljc.1 for ; Wed, 25 May 2022 02:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=2Bv3ajKIVTNEwQ0pawbSoExcXcFN6cMqlWMkg0kjBIg=; b=CKDvBHE+xhjD0HGc8tP7VGBCa0tMJorDx+sZbSmPrpZkTwEUljxSyYK3xIeZDF8x9q COU947s/kUNnaNhdKmPaWQKTsnZd38O3x0wmpNYgx4s23IRyDagUJW/gnmL2+WdrOlIg Rw2lIbuZ1HIMDOy4oIaKpO90ZkqFWTCxJznNAAInkwnGwDakAOOUQHkKZXAfFVZSEPif QV9VCKoONtrHnpYphzu7Wx3NK7aCrvqBeoQ82RXJ1M6dvSJqSl4xq/+laJxpDZRe5blP d3/laIV8ZFfTJiXIz3bVsex03x2qd3GA5C7JjNJnEZZlzzP040R7Z8qLsiwVMYdk0gTH Y/Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=2Bv3ajKIVTNEwQ0pawbSoExcXcFN6cMqlWMkg0kjBIg=; b=v/qHRCp9QLi0Cx/Ct9f3feVyEeVo7CXrCNwjSS/Et1j+kpvASU4nr/Iy8f+M+NbpXa cKpiDuSmQHHbRnFf58bqlswTbo6HHR21FxGu+1WZBgWuCHNliiwK/R0e9+MQS5rAiqK6 jbnjLAbd/uHQYVqFqyilhsgYbDQvtN0wp5Zw+iOZkPyupSsTvkFpPJbf2/xeNPM//xY7 d1N2E18iriviwBpIB9HCErmywYDYL47af1409Bj3T8nwuRoywcWR5HhOmzdWiI3WbRhy WnuGh6sjO7XrTrsozeHkt88vh/YFVRPBqGwkBrEn5XN6lW70lwV7naoFnrv/0fJZtG/A 3mQg== X-Gm-Message-State: AOAM532HMofINIudLK18qVwhScvx1gxGXOMJVg7cl7AV3J4tI3XYJ3ut orCm/LtaXfRq6k1p5M2ZXEdoDayA7j5sBYls X-Received: by 2002:a2e:93c8:0:b0:24d:b348:b070 with SMTP id p8-20020a2e93c8000000b0024db348b070mr18707837ljh.434.1653472419939; Wed, 25 May 2022 02:53:39 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id a14-20020a2e88ce000000b0025076cd5ef9sm3018429ljk.128.2022.05.25.02.53.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 May 2022 02:53:39 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 May 2022 12:53:38 +0300 Message-Id: <20220525095338.3494742-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [GASPP] [PATCH] Ignore trailing whitespace in .ifc directives X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: goLpfnlrJKBX This fixes handling of cases like ".ifc \foo, bar // comment", where there was trailing whitespace after the condition (before the comment which already was stripped out at this point). --- Will apply after a couple days. This fixes the "lavc/aarch64: add hevc horizontal qpel/uni/bi" patch when built with MSVC. --- gas-preprocessor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl index 59c93c1..47cb5ab 100755 --- a/gas-preprocessor.pl +++ b/gas-preprocessor.pl @@ -344,7 +344,7 @@ sub handle_if { $expr =~ s/\s//g; $result ^= $expr eq ""; } elsif ($type eq "c") { - if ($expr =~ /(.*)\s*,\s*(.*)/) { + if ($expr =~ /(\S*)\s*,\s*(\S*)/) { $result ^= $1 eq $2; } else { die "argument to .ifc not recognized";