From patchwork Sat Feb 10 13:17:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 7545 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp1970794jai; Sat, 10 Feb 2018 05:23:35 -0800 (PST) X-Google-Smtp-Source: AH8x224FsA2nhkeCfxLYeHRIve/5UEaWHhnSpGPZJD83DS2PKUin2i4naxZ3UODfePD8QaDcQXCz X-Received: by 10.223.186.83 with SMTP id t19mr3437103wrg.252.1518269015024; Sat, 10 Feb 2018 05:23:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518269014; cv=none; d=google.com; s=arc-20160816; b=L27Cjj6Ev3W2oYVytpbg1zsvgoM0O/YvyiUxZj6H7ocXD724b8v9okgHNaOV+vaKtP Vb3FKEmox+NINhibssJmI64h4MqOEmMVruJlMefclfmttqPfBb/NWOLYBQ0j9sLeJknk Agwr5XMBmeO3XbDHWJ2+lrz9+sOvqqQz1wm0xPvVoB7H6lZUw5vtv9JwJLZ+HtlsdwON avuiyCjy2D899YI6wTuir06NT3h8WHPthGAZzmf7UA7KpDt+oTCzgfp/okpWs39r57H6 OupYigTATfUeqFHtqLEylhWaEzKb17aARw5sQ0T1Ew8OVOiZoaqAdW9nsHTKuCG4LqKH gXIw== 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:cc: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=EEL+Hj93KkRaWhkypMaZgHWSRQeeJEU+DTrRZvac3x0=; b=myz+dRqSP1WKrLUcxq9fKR9n7ahiKEwVaEIytWyDqHKjc4RQngkg6u8GxG9iPSK1TQ ixOxg1RddXUc7uuKtVC5rWnB53XutArhBzFedrJ/26MzksVNTaYcUx6JecLeIVXWP8UZ 3xBIofYu5iDr4hUT4e5FBqwLnW/8uV1q7NSKkEHaGTWl/rhl4SHoPZPmAzkHPHvE6pUq 3fzN2+Y5CBxM+slyIOgGpkbwhzAYLi+9XnbIIawIjhG1vjDzgKF3itBzdzMnKm2kn26T jylkoglocjykYV8z4DH/RZcZTdquVYZDh3rpx+aw4PGk2RBZawDliYyGDx8C9g7wHkt7 c4uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G4O/quoI; 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 o47si3478564wrc.148.2018.02.10.05.23.33; Sat, 10 Feb 2018 05:23:34 -0800 (PST) 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=G4O/quoI; 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 3736F6899B4; Sat, 10 Feb 2018 15:23:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 495F7689988 for ; Sat, 10 Feb 2018 15:23:15 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id w50so10856185wrc.2 for ; Sat, 10 Feb 2018 05:23:25 -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; bh=RUwhM+W1igNJpgyDGr+mzn0PdVtBGnjkp8ICqJUE1jM=; b=G4O/quoIz+HwGTffg6wG7+xiv5TJ898TnYdyeoWPINUc9mloDPkwsakHbmSaG5U4Hu unYfK49DIOcMh5AkoQMKNczmU66Vwf46VI7tQaRes4PWmoOjv9n57/VG4zAO6V7Keo/V FjZvCBpLo56Rx4OxVH3sZ00xg244CNZnjQESfW+C0fXET/sRzZ9864w7Iox0ZNr6vAAP mJm14M7+vXfYvTzeSkyxwWfi/5WKE3xJLrIk+qtU19vQtP9UfVVwPMvWk6/F4hKZLK1y yxn7qLChnFUV+UDXA6erXiggFO0UBSu2mr34G8Ge+eFpd49mzdxOc2HaKhYrwwwgL4QF 6/0Q== 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; bh=RUwhM+W1igNJpgyDGr+mzn0PdVtBGnjkp8ICqJUE1jM=; b=JOvreH5cq/rsx0wlZDduQYcVcKJswV3qkr4r2mE12fnep/RjX+qxmxCAqyjmHZYlKL cHOt23y/vSocuwR1wM99mPozqOslK3lwiO5xiogAi+eLFLUuZxHq62967I4DivEET0h5 9iAQKsRZe0rkC1dCWkus6BVQMNI9oE1gC6RBnYl7hUy5CCOlVjeP+vGsFBy/e0cGmzfy rSnMyq5K3o0GkypWZcojqqjYEX12qh/Ai6RFFMBXeTtMtef4zwx44KV/0+rIMnUrQvdY mJKhMi4EQP/Cd5TS3i902SDoyUVllrIzWScJo7DoruOTuqPFu3ZfbR/RSNAdID/2wBoZ o0bQ== X-Gm-Message-State: APf1xPCP2vP1cDdrB9854ZxEbN3LURnGf2MrhFhMorYAJr/zGqJemKdn puj2n+daBY/uFgYlJH0mKAsy+DGs X-Received: by 10.223.139.14 with SMTP id n14mr5483797wra.23.1518268663597; Sat, 10 Feb 2018 05:17:43 -0800 (PST) Received: from skyhide.pars.ee ([2a00:23c4:7c88:af00:2038:1d11:9e59:5849]) by smtp.gmail.com with ESMTPSA id c18sm738262wmd.18.2018.02.10.05.17.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Feb 2018 05:17:42 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Feb 2018 13:17:40 +0000 Message-Id: <20180210131740.23020-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.16.1.101.gde0f0111ea Subject: [FFmpeg-devel] [PATCH] h264_idct: enable unmacro on newer NASM versions 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: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Rostislav Pehlivanov --- libavcodec/x86/h264_idct.asm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index 8804638091..c54f9f1a68 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -1144,7 +1144,11 @@ IDCT_DC_DEQUANT 0 INIT_MMX sse2 IDCT_DC_DEQUANT 7 -; %unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm doesn't have this yet +%ifdef __NASM_VER__ +%if __NASM_MAJOR__ >= 2 && __NASM_MINOR__ >= 4 +%unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm doesn't have this yet +%endif +%endif %macro STORE_DIFFx2 8 ; add1, add2, reg1, reg2, zero, shift, source, stride movd %3, [%7] movd %4, [%7+%8]